Various fixes (#42)

- Removes linux embedder code
- macOS cleanup + test
- Make things compile with flutter web

Author: mattkae

engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowController.h

@@ -1,8 +1,15 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERWINDOWCONTROLLER_H_
 #define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERWINDOWCONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
+#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterViewController.h"
+
 @class FlutterEngine;
 
 @interface FlutterWindowController : NSObject
@@ -11,4 +18,54 @@
 
 @end
 
+struct FlutterWindowCreationRequest {
+  double width;
+  double height;
+  double min_width;
+  double min_height;
+  double max_width;
+  double max_height;
+  void (*on_close)();
+  void (*on_size_change)();
+};
+
+struct FlutterWindowSize {
+  double width;
+  double height;
+};
+
+extern "C" {
+
+// NOLINTBEGIN(google-objc-function-naming)
+
+FLUTTER_DARWIN_EXPORT
+int64_t FlutterCreateRegularWindow(int64_t engine_id, const FlutterWindowCreationRequest* request);
+
+FLUTTER_DARWIN_EXPORT
+void FlutterDestroyWindow(int64_t engine_id, void* window);
+
+FLUTTER_DARWIN_EXPORT
+void* FlutterGetWindowHandle(int64_t engine_id, FlutterViewIdentifier view_id);
+
+FLUTTER_DARWIN_EXPORT
+void* FlutterGetWindowHandle(int64_t engine_id, FlutterViewIdentifier view_id);
+
+FLUTTER_DARWIN_EXPORT
+void FlutterGetWindowSize(void* window, FlutterWindowSize* size);
+
+FLUTTER_DARWIN_EXPORT
+void FlutterSetWindowSize(void* window, double width, double height);
+
+FLUTTER_DARWIN_EXPORT
+void FlutterSetWindowTitle(void* window, const char* title);
+
+FLUTTER_DARWIN_EXPORT
+int64_t FlutterGetWindowState(void* window);
+
+FLUTTER_DARWIN_EXPORT
+void FlutterSetWindowState(void* window, int64_t state);
+
+// NOLINTEND(google-objc-function-naming)
+}
+
 #endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERWINDOWCONTROLLER_H_

engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowController.mm

@@ -1,3 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowController.h"
 
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
@@ -7,17 +11,6 @@
 
 #include "flutter/shell/platform/common/isolate_scope.h"
 
-struct FlutterWindowCreationRequest {
-  double width;
-  double height;
-  double min_width;
-  double min_height;
-  double max_width;
-  double max_height;
-  void (*on_close)();
-  void (*on_size_change)();
-};
-
 /// A delegate for a Flutter managed window.
 @interface FlutterWindowOwner : NSObject <NSWindowDelegate> {
   /// Strong reference to the window. This is the only strong reference to the
@@ -134,57 +127,43 @@ - (void)destroyWindow:(NSWindow*)window {
 
 @end
 
-extern "C" {
 // NOLINTBEGIN(google-objc-function-naming)
 
-FLUTTER_DARWIN_EXPORT
-int64_t flutter_create_regular_window(int64_t engine_id,
-                                      const FlutterWindowCreationRequest* request) {
+int64_t FlutterCreateRegularWindow(int64_t engine_id, const FlutterWindowCreationRequest* request) {
   FlutterEngine* engine = [FlutterEngine engineForIdentifier:engine_id];
   [engine enableMultiView];
   return [engine.windowController createRegularWindow:request];
 }
 
-FLUTTER_DARWIN_EXPORT
-void flutter_destroy_window(int64_t engine_id, void* window) {
+void FlutterDestroyWindow(int64_t engine_id, void* window) {
   NSWindow* w = (__bridge NSWindow*)window;
   FlutterEngine* engine = [FlutterEngine engineForIdentifier:engine_id];
   [engine.windowController destroyWindow:w];
 }
 
-FLUTTER_DARWIN_EXPORT
-void* flutter_get_window_handle(int64_t engine_id, FlutterViewIdentifier view_id) {
+void* FlutterGetWindowHandle(int64_t engine_id, FlutterViewIdentifier view_id) {
   FlutterEngine* engine = [FlutterEngine engineForIdentifier:engine_id];
   FlutterViewController* controller = [engine viewControllerForIdentifier:view_id];
   return (__bridge void*)controller.view.window;
 }
 
-struct FlutterWindowSize {
-  double width;
-  double height;
-};
-
-FLUTTER_DARWIN_EXPORT
-void flutter_get_window_size(void* window, FlutterWindowSize* size) {
+void FlutterGetWindowSize(void* window, FlutterWindowSize* size) {
   NSWindow* w = (__bridge NSWindow*)window;
   size->width = w.frame.size.width;
   size->height = w.frame.size.height;
 }
 
-FLUTTER_DARWIN_EXPORT
-void flutter_set_window_size(void* window, double width, double height) {
+void FlutterSetWindowSize(void* window, double width, double height) {
   NSWindow* w = (__bridge NSWindow*)window;
   [w setContentSize:NSMakeSize(width, height)];
 }
 
-FLUTTER_DARWIN_EXPORT
-void flutter_set_window_title(void* window, const char* title) {
+void FlutterSetWindowTitle(void* window, const char* title) {
   NSWindow* w = (__bridge NSWindow*)window;
   w.title = [NSString stringWithUTF8String:title];
 }
 
-FLUTTER_DARWIN_EXPORT
-int64_t flutter_get_window_state(void* window) {
+int64_t FlutterGetWindowState(void* window) {
   NSWindow* w = (__bridge NSWindow*)window;
   if (w.isZoomed) {
     return 1;
@@ -195,8 +174,7 @@ int64_t flutter_get_window_state(void* window) {
   }
 }
 
-FLUTTER_DARWIN_EXPORT
-void flutter_set_window_state(void* window, int64_t state) {
+void FlutterSetWindowState(void* window, int64_t state) {
   NSWindow* w = (__bridge NSWindow*)window;
   if (state == 1) {
     [w zoom:nil];
@@ -217,4 +195,3 @@ void flutter_set_window_state(void* window, int64_t state) {
 }
 
 // NOLINTEND(google-objc-function-naming)
-}  // extern "C"

engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowControllerTest.mm

@@ -0,0 +1,47 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/common/isolate_scope.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowController.h"
+#import "flutter/testing/testing.h"
+#import "third_party/googletest/googletest/include/gtest/gtest.h"
+
+namespace flutter::testing {
+
+using FlutterWindowControllerTest = FlutterEngineTest;
+
+TEST_F(FlutterWindowControllerTest, Test1) {
+  FlutterEngine* engine = GetFlutterEngine();
+  FlutterWindowController* controller = [[FlutterWindowController alloc] init];
+  controller.engine = engine;
+
+  std::unique_ptr<flutter::Isolate> isolate;
+  bool signalled = false;
+
+  AddNativeCallback("SignalNativeTest", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
+                      fprintf(stderr, "Signal native test\n");
+                      isolate = std::make_unique<flutter::Isolate>();
+                      signalled = true;
+                    }));
+
+  EXPECT_TRUE([engine runWithEntrypoint:@"testWindowController"]);
+  while (!signalled) {
+    CFRunLoopRunInMode(kCFRunLoopDefaultMode, 1, YES);
+  }
+
+  FlutterWindowCreationRequest request{
+      .width = 800,
+      .height = 600,
+      .on_close = [] {},
+      .on_size_change = [] {},
+  };
+
+  int64_t engine_id = reinterpret_cast<int64_t>(engine);
+
+  IsolateScope isolate_scope(*isolate.get());
+  int64_t handle = FlutterCreateRegularWindow(engine_id, &request);
+  EXPECT_EQ(handle, 1);
+}
+}  // namespace flutter::testing

engine/src/flutter/shell/platform/darwin/macos/framework/Source/fixtures/flutter_desktop_test.dart

@@ -93,3 +93,8 @@ external void notifyEngineId(int? engineId);
 void testEngineId() {
   notifyEngineId(PlatformDispatcher.instance.engineId);
 }
+
+@pragma('vm:entry-point')
+void testWindowController() {
+  signalNativeTest();
+}

engine/src/flutter/shell/platform/linux/BUILD.gn

@@ -159,8 +159,6 @@ source_set("flutter_linux_sources") {
     "fl_view.cc",
     "fl_view_accessible.cc",
     "fl_window_state_monitor.cc",
-    "fl_windowing.cc",
-    "fl_windowing.h",
     "fl_windowing_channel.cc",
     "fl_windowing_handler.cc",
     "key_mapping.g.cc",