Migrate the engine to use an API that knows about screens.

Author: gspencergoog

ci/licenses_golden/licenses_flutter

@@ -394,6 +394,9 @@ FILE: ../../../flutter/lib/ui/ui_benchmarks.cc
 FILE: ../../../flutter/lib/ui/ui_dart_state.cc
 FILE: ../../../flutter/lib/ui/ui_dart_state.h
 FILE: ../../../flutter/lib/ui/window.dart
+FILE: ../../../flutter/lib/ui/window/platform_configuration.cc
+FILE: ../../../flutter/lib/ui/window/platform_configuration.h
+FILE: ../../../flutter/lib/ui/window/platform_configuration_unittests.cc
 FILE: ../../../flutter/lib/ui/window/platform_message.cc
 FILE: ../../../flutter/lib/ui/window/platform_message.h
 FILE: ../../../flutter/lib/ui/window/platform_message_response.cc
@@ -407,6 +410,10 @@ FILE: ../../../flutter/lib/ui/window/pointer_data_packet.h
 FILE: ../../../flutter/lib/ui/window/pointer_data_packet_converter.cc
 FILE: ../../../flutter/lib/ui/window/pointer_data_packet_converter.h
 FILE: ../../../flutter/lib/ui/window/pointer_data_packet_converter_unittests.cc
+FILE: ../../../flutter/lib/ui/window/screen.cc
+FILE: ../../../flutter/lib/ui/window/screen.h
+FILE: ../../../flutter/lib/ui/window/screen_metrics.cc
+FILE: ../../../flutter/lib/ui/window/screen_metrics.h
 FILE: ../../../flutter/lib/ui/window/viewport_metrics.cc
 FILE: ../../../flutter/lib/ui/window/viewport_metrics.h
 FILE: ../../../flutter/lib/ui/window/window.cc

examples/glfw/FlutterEmbedderGLFW.cc

@@ -68,8 +68,31 @@ static void GLFWKeyCallback(GLFWwindow* window,
 }
 
 void GLFWwindowSizeCallback(GLFWwindow* window, int width, int height) {
+  int left, top;
+  glfwGetWindowPos(window, &left, &top);
   FlutterWindowMetricsEvent event = {};
   event.struct_size = sizeof(event);
+  event.window_id = 0;
+  event.screen_id = 0;
+  event.left = left * g_pixelRatio;
+  event.top = top * g_pixelRatio;
+  event.width = width * g_pixelRatio;
+  event.height = height * g_pixelRatio;
+  event.pixel_ratio = g_pixelRatio;
+  FlutterEngineSendWindowMetricsEvent(
+      reinterpret_cast<FlutterEngine>(glfwGetWindowUserPointer(window)),
+      &event);
+}
+
+void GLFWwindowPosCallback(GLFWwindow* window, int left, int top) {
+  int width, height;
+  glfwGetWindowSize(window, &width, &height);
+  FlutterWindowMetricsEvent event = {};
+  event.struct_size = sizeof(event);
+  event.window_id = 0;
+  event.screen_id = 0;
+  event.left = left * g_pixelRatio;
+  event.top = top * g_pixelRatio;
   event.width = width * g_pixelRatio;
   event.height = height * g_pixelRatio;
   event.pixel_ratio = g_pixelRatio;
@@ -150,6 +173,7 @@ int main(int argc, const char* argv[]) {
 
   glfwSetKeyCallback(window, GLFWKeyCallback);
   glfwSetWindowSizeCallback(window, GLFWwindowSizeCallback);
+  glfwSetWindowPosCallback(window, GLFWwindowPosCallback);
   glfwSetMouseButtonCallback(window, GLFWmouseButtonCallback);
 
   while (!glfwWindowShouldClose(window)) {

lib/ui/BUILD.gn

@@ -89,6 +89,8 @@ source_set_maybe_fuchsia_legacy("ui") {
     "text/text_box.h",
     "ui_dart_state.cc",
     "ui_dart_state.h",
+    "window/platform_configuration.cc",
+    "window/platform_configuration.h",
     "window/platform_message.cc",
     "window/platform_message.h",
     "window/platform_message_response.cc",
@@ -101,6 +103,10 @@ source_set_maybe_fuchsia_legacy("ui") {
     "window/pointer_data_packet.h",
     "window/pointer_data_packet_converter.cc",
     "window/pointer_data_packet_converter.h",
+    "window/screen.cc",
+    "window/screen.h",
+    "window/screen_metrics.cc",
+    "window/screen_metrics.h",
     "window/viewport_metrics.cc",
     "window/viewport_metrics.h",
     "window/window.cc",
@@ -162,6 +168,7 @@ if (current_toolchain == host_toolchain) {
     sources = [
       "painting/image_decoder_unittests.cc",
       "painting/vertices_unittests.cc",
+      "window/platform_configuration_unittests.cc",
       "window/pointer_data_packet_converter_unittests.cc",
     ]
 

lib/ui/compositing/scene.cc

@@ -8,6 +8,7 @@
 #include "flutter/lib/ui/painting/image.h"
 #include "flutter/lib/ui/painting/picture.h"
 #include "flutter/lib/ui/ui_dart_state.h"
+#include "flutter/lib/ui/window/platform_configuration.h"
 #include "flutter/lib/ui/window/window.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "third_party/skia/include/core/SkSurface.h"
@@ -41,7 +42,13 @@ Scene::Scene(std::shared_ptr<flutter::Layer> rootLayer,
              uint32_t rasterizerTracingThreshold,
              bool checkerboardRasterCacheImages,
              bool checkerboardOffscreenLayers) {
-  auto viewport_metrics = UIDartState::Current()->window()->viewport_metrics();
+  // TODO(gspencergoog): Currently, there is only one window. This will change
+  // as multi-window support is added. See
+  // https://github.com/flutter/flutter/issues/60131
+  auto viewport_metrics = UIDartState::Current()
+                              ->platform_configuration()
+                              ->get_window(0)
+                              ->viewport_metrics();
 
   layer_tree_ = std::make_unique<LayerTree>(
       SkISize::Make(viewport_metrics.physical_width,

lib/ui/dart_ui.cc

@@ -28,7 +28,7 @@
 #include "flutter/lib/ui/text/font_collection.h"
 #include "flutter/lib/ui/text/paragraph.h"
 #include "flutter/lib/ui/text/paragraph_builder.h"
-#include "flutter/lib/ui/window/window.h"
+#include "flutter/lib/ui/window/platform_configuration.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/logging/dart_error.h"
 
@@ -81,7 +81,7 @@ void DartUI::InitForGlobal() {
     SemanticsUpdate::RegisterNatives(g_natives);
     SemanticsUpdateBuilder::RegisterNatives(g_natives);
     Vertices::RegisterNatives(g_natives);
-    Window::RegisterNatives(g_natives);
+    PlatformConfiguration::RegisterNatives(g_natives);
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
     SceneHost::RegisterNatives(g_natives);
 #endif

lib/ui/hooks.dart

@@ -55,6 +55,32 @@ void _updateWindowMetrics(
   _invoke(window.onMetricsChanged, window._onMetricsChangedZone);
 }
 
+@pragma('vm:entry-point')
+// ignore: unused_element
+void _updateScreenMetrics(
+    Object screenId,
+    double left,
+    double top,
+    double width,
+    double height,
+    double devicePixelRatio,
+    double viewPaddingTop,
+    double viewPaddingRight,
+    double viewPaddingBottom,
+    double viewPaddingLeft,
+    double viewInsetTop,
+    double viewInsetRight,
+    double viewInsetBottom,
+    double viewInsetLeft,
+    double systemGestureInsetTop,
+    double systemGestureInsetRight,
+    double systemGestureInsetBottom,
+    double systemGestureInsetLeft,
+    ) {
+  // TODO(gspencergoog): Once dart:ui understands screens, set their metrics
+  // here. See https://github.com/flutter/flutter/issues/60131
+}
+
 typedef _LocaleClosure = String? Function();
 
 String? _localeClosure() {
@@ -238,7 +264,7 @@ void _runMainZoned(Function startMainIsolateFunction,
   }, null);
 }
 
-void _reportUnhandledException(String error, String stackTrace) native 'Window_reportUnhandledException';
+void _reportUnhandledException(String error, String stackTrace) native 'PlatformConfiguration_reportUnhandledException';
 
 /// Invokes [callback] inside the given [zone].
 void _invoke(void callback()?, Zone zone) {

lib/ui/painting/canvas.cc

@@ -11,6 +11,7 @@
 #include "flutter/lib/ui/painting/image.h"
 #include "flutter/lib/ui/painting/matrix.h"
 #include "flutter/lib/ui/ui_dart_state.h"
+#include "flutter/lib/ui/window/platform_configuration.h"
 #include "flutter/lib/ui/window/window.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ -422,11 +423,18 @@ void Canvas::drawShadow(const CanvasPath* path,
                         SkColor color,
                         double elevation,
                         bool transparentOccluder) {
-  if (!path)
+  if (!path) {
     Dart_ThrowException(
         ToDart("Canvas.drawShader called with non-genuine Path."));
-  SkScalar dpr =
-      UIDartState::Current()->window()->viewport_metrics().device_pixel_ratio;
+  }
+  // TODO(gspencergoog): Currently, there is only one window. This will change
+  // as multi-window support is added. See
+  // https://github.com/flutter/flutter/issues/60131
+  SkScalar dpr = UIDartState::Current()
+                     ->platform_configuration()
+                     ->get_window(0)
+                     ->viewport_metrics()
+                     .device_pixel_ratio;
   external_allocation_size_ += path->path().approximateBytesUsed();
   flutter::PhysicalShapeLayer::DrawShadow(canvas_, path->path(), color,
                                           elevation, transparentOccluder, dpr);

lib/ui/text/font_collection.cc

@@ -8,7 +8,7 @@
 
 #include "flutter/lib/ui/text/asset_manager_font_provider.h"
 #include "flutter/lib/ui/ui_dart_state.h"
-#include "flutter/lib/ui/window/window.h"
+#include "flutter/lib/ui/window/platform_configuration.h"
 #include "flutter/runtime/test_font_data.h"
 #include "rapidjson/document.h"
 #include "rapidjson/rapidjson.h"
@@ -30,8 +30,10 @@ namespace {
 void LoadFontFromList(tonic::Uint8List& font_data,
                       Dart_Handle callback,
                       std::string family_name) {
-  FontCollection& font_collection =
-      UIDartState::Current()->window()->client()->GetFontCollection();
+  FontCollection& font_collection = UIDartState::Current()
+                                        ->platform_configuration()
+                                        ->client()
+                                        ->GetFontCollection();
   font_collection.LoadFontFromList(font_data.data(), font_data.num_elements(),
                                    family_name);
   font_data.Release();

lib/ui/text/paragraph_builder.cc

@@ -10,7 +10,7 @@
 #include "flutter/fml/task_runner.h"
 #include "flutter/lib/ui/text/font_collection.h"
 #include "flutter/lib/ui/ui_dart_state.h"
-#include "flutter/lib/ui/window/window.h"
+#include "flutter/lib/ui/window/platform_configuration.h"
 #include "flutter/third_party/txt/src/txt/font_style.h"
 #include "flutter/third_party/txt/src/txt/font_weight.h"
 #include "flutter/third_party/txt/src/txt/paragraph_style.h"
@@ -288,8 +288,10 @@ ParagraphBuilder::ParagraphBuilder(
     style.locale = locale;
   }
 
-  FontCollection& font_collection =
-      UIDartState::Current()->window()->client()->GetFontCollection();
+  FontCollection& font_collection = UIDartState::Current()
+                                        ->platform_configuration()
+                                        ->client()
+                                        ->GetFontCollection();
 
 #if FLUTTER_ENABLE_SKSHAPER
 #define FLUTTER_PARAGRAPH_BUILDER txt::ParagraphBuilder::CreateSkiaBuilder

lib/ui/ui_dart_state.cc

@@ -5,6 +5,7 @@
 #include "flutter/lib/ui/ui_dart_state.h"
 
 #include "flutter/fml/message_loop.h"
+#include "flutter/lib/ui/window/platform_configuration.h"
 #include "flutter/lib/ui/window/window.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_message_handler.h"
@@ -73,18 +74,23 @@ void UIDartState::ThrowIfUIOperationsProhibited() {
 
 void UIDartState::SetDebugName(const std::string debug_name) {
   debug_name_ = debug_name;
-  if (window_)
-    window_->client()->UpdateIsolateDescription(debug_name_, main_port_);
+  if (platform_configuration_) {
+    platform_configuration_->client()->UpdateIsolateDescription(debug_name_,
+                                                                main_port_);
+  }
 }
 
 UIDartState* UIDartState::Current() {
   return static_cast<UIDartState*>(DartState::Current());
 }
 
-void UIDartState::SetWindow(std::unique_ptr<Window> window) {
-  window_ = std::move(window);
-  if (window_)
-    window_->client()->UpdateIsolateDescription(debug_name_, main_port_);
+void UIDartState::SetPlatformConfiguration(
+    std::unique_ptr<PlatformConfiguration> platform_configuration) {
+  platform_configuration_ = std::move(platform_configuration);
+  if (platform_configuration_) {
+    platform_configuration_->client()->UpdateIsolateDescription(debug_name_,
+                                                                main_port_);
+  }
 }
 
 const TaskRunners& UIDartState::GetTaskRunners() const {