Multiwindow ffi

dev/bots/allowlist.dart

@@ -23,6 +23,7 @@ const Set<String> kCorePackageAllowList = <String>{
   'clock',
   'collection',
   'fake_async',
+  'ffi',
   'file',
   'flutter',
   'flutter_driver',

engine/src/flutter/ci/licenses_golden/excluded_files

@@ -416,6 +416,7 @@
 ../../../flutter/shell/platform/windows/direct_manipulation_unittests.cc
 ../../../flutter/shell/platform/windows/dpi_utils_unittests.cc
 ../../../flutter/shell/platform/windows/fixtures
+../../../flutter/shell/platform/windows/flutter_host_window_controller_unittests.cc
 ../../../flutter/shell/platform/windows/flutter_project_bundle_unittests.cc
 ../../../flutter/shell/platform/windows/flutter_window_unittests.cc
 ../../../flutter/shell/platform/windows/flutter_windows_engine_unittests.cc

engine/src/flutter/ci/licenses_golden/licenses_flutter

@@ -52793,6 +52793,8 @@ ORIGIN: ../../../flutter/shell/platform/common/flutter_platform_node_delegate.h
 ORIGIN: ../../../flutter/shell/platform/common/geometry.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/common/incoming_message_dispatcher.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/common/incoming_message_dispatcher.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/isolate_scope.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/isolate_scope.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/common/json_message_codec.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/common/json_message_codec.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/common/json_method_codec.cc + ../../../flutter/LICENSE
@@ -52813,6 +52815,7 @@ ORIGIN: ../../../flutter/shell/platform/common/text_input_model.cc + ../../../fl
 ORIGIN: ../../../flutter/shell/platform/common/text_input_model.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/common/text_range.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/common/InternalFlutterSwiftCommon-Bridging-Header.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/windowing.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/common/availability_version_check.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/common/availability_version_check.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/common/buffer_conversions.h + ../../../flutter/LICENSE
@@ -53091,6 +53094,9 @@ ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterVie
 ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProviderTest.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowController.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowController.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowControllerTest.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/KeyCodeMap.g.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/KeyCodeMapTest.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/KeyCodeMap_Internal.h + ../../../flutter/LICENSE
@@ -53549,6 +53555,10 @@ ORIGIN: ../../../flutter/shell/platform/windows/external_texture_d3d.h + ../../.
 ORIGIN: ../../../flutter/shell/platform/windows/external_texture_pixelbuffer.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/windows/external_texture_pixelbuffer.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/windows/flutter_desktop_messenger.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_host_window.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_host_window.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_host_window_controller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_host_window_controller.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/windows/flutter_key_map.g.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/windows/flutter_platform_node_delegate_windows.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/windows/flutter_platform_node_delegate_windows.h + ../../../flutter/LICENSE
@@ -55832,6 +55842,8 @@ FILE: ../../../flutter/shell/platform/common/flutter_platform_node_delegate.h
 FILE: ../../../flutter/shell/platform/common/geometry.h
 FILE: ../../../flutter/shell/platform/common/incoming_message_dispatcher.cc
 FILE: ../../../flutter/shell/platform/common/incoming_message_dispatcher.h
+FILE: ../../../flutter/shell/platform/common/isolate_scope.cc
+FILE: ../../../flutter/shell/platform/common/isolate_scope.h
 FILE: ../../../flutter/shell/platform/common/json_message_codec.cc
 FILE: ../../../flutter/shell/platform/common/json_message_codec.h
 FILE: ../../../flutter/shell/platform/common/json_method_codec.cc
@@ -55854,6 +55866,7 @@ FILE: ../../../flutter/shell/platform/common/text_range.h
 FILE: ../../../flutter/shell/platform/darwin/common/InternalFlutterSwiftCommon-Bridging-Header.h
 FILE: ../../../flutter/shell/platform/darwin/common/SwiftTestingMain.swift
 FILE: ../../../flutter/shell/platform/darwin/common/SwiftTestingRunner.swift
+FILE: ../../../flutter/shell/platform/common/windowing.h
 FILE: ../../../flutter/shell/platform/darwin/common/availability_version_check.cc
 FILE: ../../../flutter/shell/platform/darwin/common/availability_version_check.h
 FILE: ../../../flutter/shell/platform/darwin/common/buffer_conversions.h
@@ -56142,6 +56155,9 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewE
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProviderTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewTest.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowController.h
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowController.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowControllerTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/KeyCodeMap.g.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/KeyCodeMapTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/KeyCodeMap_Internal.h
@@ -56606,6 +56622,10 @@ FILE: ../../../flutter/shell/platform/windows/external_texture_d3d.h
 FILE: ../../../flutter/shell/platform/windows/external_texture_pixelbuffer.cc
 FILE: ../../../flutter/shell/platform/windows/external_texture_pixelbuffer.h
 FILE: ../../../flutter/shell/platform/windows/flutter_desktop_messenger.h
+FILE: ../../../flutter/shell/platform/windows/flutter_host_window.cc
+FILE: ../../../flutter/shell/platform/windows/flutter_host_window.h
+FILE: ../../../flutter/shell/platform/windows/flutter_host_window_controller.cc
+FILE: ../../../flutter/shell/platform/windows/flutter_host_window_controller.h
 FILE: ../../../flutter/shell/platform/windows/flutter_key_map.g.cc
 FILE: ../../../flutter/shell/platform/windows/flutter_platform_node_delegate_windows.cc
 FILE: ../../../flutter/shell/platform/windows/flutter_platform_node_delegate_windows.h

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

@@ -57,6 +57,16 @@ source_set("common_cpp_input") {
   deps = [ "//flutter/fml:fml" ]
 }
 
+source_set("common_cpp_isolate_scope") {
+  public = [ "isolate_scope.h" ]
+  sources = [ "isolate_scope.cc" ]
+
+  deps = [
+    "$dart_src/runtime:dart_api",
+    "//flutter/fml:fml",
+  ]
+}
+
 source_set("common_cpp_enums") {
   public = [
     "app_lifecycle_state.h",
@@ -142,11 +152,14 @@ source_set("common_cpp_core") {
   public = [
     "geometry.h",
     "path_utils.h",
+    "windowing.h",
   ]
 
   sources = [ "path_utils.cc" ]
 
   public_configs = [ "//flutter:config" ]
+
+  deps = [ "//flutter/fml:fml" ]
 }
 
 if (enable_unittests) {

engine/src/flutter/shell/platform/common/geometry.h

@@ -6,6 +6,8 @@
 #define FLUTTER_SHELL_PLATFORM_COMMON_GEOMETRY_H_
 
 #include <cmath>
+#include <limits>
+#include <optional>
 
 namespace flutter {
 
@@ -45,6 +47,7 @@ class Size {
   bool operator==(const Size& other) const {
     return width_ == other.width_ && height_ == other.height_;
   }
+  bool operator!=(const Size& other) const { return !(*this == other); }
 
  private:
   double width_ = 0.0;
@@ -78,6 +81,27 @@ class Rect {
   Size size_;
 };
 
+// Encapsulates a min and max size that represents the constraints that some
+// arbitrary box is able to take up.
+class BoxConstraints {
+ public:
+  BoxConstraints() = default;
+  BoxConstraints(const std::optional<Size>& smallest,
+                 const std::optional<Size>& biggest)
+      : smallest_(smallest.value_or(Size(0, 0))),
+        biggest_(
+            biggest.value_or(Size(std::numeric_limits<double>::infinity(),
+                                  std::numeric_limits<double>::infinity()))) {}
+  BoxConstraints(const BoxConstraints& other) = default;
+  Size biggest() const { return biggest_; }
+  Size smallest() const { return smallest_; }
+
+ private:
+  Size smallest_ = Size(0, 0);
+  Size biggest_ = Size(std::numeric_limits<double>::infinity(),
+                       std::numeric_limits<double>::infinity());
+};
+
 }  // namespace flutter
 
 #endif  // FLUTTER_SHELL_PLATFORM_COMMON_GEOMETRY_H_

engine/src/flutter/shell/platform/common/isolate_scope.cc

@@ -0,0 +1,40 @@
+// 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.
+
+#include "flutter/shell/platform/common/isolate_scope.h"
+
+namespace flutter {
+
+Isolate Isolate::Current() {
+  Dart_Isolate isolate = Dart_CurrentIsolate();
+  return Isolate(isolate);
+}
+
+IsolateScope::IsolateScope(const Isolate& isolate) {
+  isolate_ = isolate.isolate_;
+  previous_ = Dart_CurrentIsolate();
+  if (previous_ == isolate_) {
+    return;
+  }
+  if (previous_) {
+    Dart_ExitIsolate();
+  }
+  Dart_EnterIsolate(isolate_);
+};
+
+IsolateScope::~IsolateScope() {
+  Dart_Isolate current = Dart_CurrentIsolate();
+  FML_DCHECK(!current || current == isolate_);
+  if (previous_ == isolate_) {
+    return;
+  }
+  if (current) {
+    Dart_ExitIsolate();
+  }
+  if (previous_) {
+    Dart_EnterIsolate(previous_);
+  }
+}
+
+}  // namespace flutter

engine/src/flutter/shell/platform/common/isolate_scope.h

@@ -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.
+
+#include "flutter/fml/logging.h"
+#include "third_party/dart/runtime/include/dart_api.h"
+
+#ifndef FLUTTER_SHELL_PLATFORM_COMMON_ISOLATE_SCOPE_H_
+#define FLUTTER_SHELL_PLATFORM_COMMON_ISOLATE_SCOPE_H_
+
+namespace flutter {
+
+/// This class is a thin wrapper around dart isolate. It can be used
+/// as argument to IsolateScope constructor to enter and exit the isolate.
+class Isolate {
+ public:
+  /// Retrieve the current Dart Isolate. If no isolate is current, this
+  /// results in a crash.
+  static Isolate Current();
+
+  ~Isolate() = default;
+
+ private:
+  explicit Isolate(Dart_Isolate isolate) : isolate_(isolate) {
+    FML_DCHECK(isolate_ != nullptr);
+  }
+
+  friend class IsolateScope;
+  Dart_Isolate isolate_;
+};
+
+// Enters provided isolate for as long as the scope is alive.
+class IsolateScope {
+ public:
+  explicit IsolateScope(const Isolate& isolate);
+  ~IsolateScope();
+
+ private:
+  Dart_Isolate isolate_;
+  Dart_Isolate previous_;
+  IsolateScope() = delete;
+  IsolateScope(IsolateScope const&) = delete;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_COMMON_ISOLATE_SCOPE_H_

engine/src/flutter/shell/platform/common/windowing.h

@@ -0,0 +1,20 @@
+// 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_COMMON_WINDOWING_H_
+#define FLUTTER_SHELL_PLATFORM_COMMON_WINDOWING_H_
+
+namespace flutter {
+
+// Types of windows.
+// The value must match value from WindowType in the Dart code
+// in packages/flutter/lib/src/widgets/window.dart
+enum class WindowArchetype {
+  // Regular top-level window.
+  kRegular,
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_COMMON_WINDOWING_H_

engine/src/flutter/shell/platform/darwin/macos/BUILD.gn

@@ -133,6 +133,8 @@ source_set("flutter_framework_source") {
     "framework/Source/FlutterViewEngineProvider.h",
     "framework/Source/FlutterViewEngineProvider.mm",
     "framework/Source/FlutterViewProvider.h",
+    "framework/Source/FlutterWindowController.h",
+    "framework/Source/FlutterWindowController.mm",
     "framework/Source/KeyCodeMap.g.mm",
   ]
 
@@ -143,8 +145,10 @@ source_set("flutter_framework_source") {
     "//flutter/flow:flow",
     "//flutter/fml",
     "//flutter/shell/platform/common:common_cpp_accessibility",
+    "//flutter/shell/platform/common:common_cpp_core",
     "//flutter/shell/platform/common:common_cpp_enums",
     "//flutter/shell/platform/common:common_cpp_input",
+    "//flutter/shell/platform/common:common_cpp_isolate_scope",
     "//flutter/shell/platform/common:common_cpp_switches",
     "//flutter/shell/platform/darwin/common:availability_version_check",
     "//flutter/shell/platform/darwin/common:framework_common",
@@ -238,14 +242,17 @@ executable("flutter_desktop_darwin_unittests") {
     "framework/Source/KeyCodeMapTest.mm",
     "framework/Source/TestFlutterPlatformView.h",
     "framework/Source/TestFlutterPlatformView.mm",
+    "framework/source/FlutterWindowControllerTest.mm",
   ]
 
   deps = [
     ":flutter_desktop_darwin_fixtures",
     ":flutter_framework_source",
     "//flutter/fml",
     "//flutter/shell/platform/common:common_cpp_accessibility",
+    "//flutter/shell/platform/common:common_cpp_core",
     "//flutter/shell/platform/common:common_cpp_enums",
+    "//flutter/shell/platform/common:common_cpp_isolate_scope",
     "//flutter/shell/platform/darwin/common:framework_common",
     "//flutter/shell/platform/darwin/common:test_utils_swift",
     "//flutter/shell/platform/darwin/graphics",