From 6e81c2fd9c40a6d2391b5e99885521cc93142a38 Mon Sep 17 00:00:00 2001
From: Mouad Debbar <mdebbar@google.com>
Date: Mon, 18 Sep 2023 10:55:01 -0400
Subject: [PATCH] [web] Rename EngineFlutterWindow =>
 EngineSingletonFlutterWindow

---
 lib/web_ui/lib/src/engine/platform_dispatcher.dart     |  6 +++---
 lib/web_ui/lib/src/engine/window.dart                  | 10 ++++++----
 lib/web_ui/lib/ui_web/src/ui_web/testing.dart          |  2 +-
 lib/web_ui/test/engine/routing_test.dart               |  4 ++--
 lib/web_ui/test/engine/surface/platform_view_test.dart |  3 ++-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/web_ui/lib/src/engine/platform_dispatcher.dart b/lib/web_ui/lib/src/engine/platform_dispatcher.dart
index 89bbab28f046b..6575b5e2e0389 100644
--- a/lib/web_ui/lib/src/engine/platform_dispatcher.dart
+++ b/lib/web_ui/lib/src/engine/platform_dispatcher.dart
@@ -505,7 +505,7 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
             // TODO(a-wallen): As multi-window support expands, the pop call
             // will need to include the view ID. Right now only one view is
             // supported.
-            (viewData[kImplicitViewId]! as EngineFlutterWindow)
+            (viewData[kImplicitViewId]! as EngineSingletonFlutterWindow)
                 .browserHistory
                 .exit()
                 .then((_) {
@@ -618,7 +618,7 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
         // TODO(a-wallen): As multi-window support expands, the navigation call
         // will need to include the view ID. Right now only one view is
         // supported.
-        (viewData[kImplicitViewId]! as EngineFlutterWindow)
+        (viewData[kImplicitViewId]! as EngineSingletonFlutterWindow)
             .handleNavigationMessage(data)
             .then((bool handled) {
           if (handled) {
@@ -1232,7 +1232,7 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   @override
   String get defaultRouteName {
     return _defaultRouteName ??=
-        (viewData[kImplicitViewId]! as EngineFlutterWindow).browserHistory.currentPath;
+        (viewData[kImplicitViewId]! as EngineSingletonFlutterWindow).browserHistory.currentPath;
   }
 
   /// Lazily initialized when the `defaultRouteName` getter is invoked.
diff --git a/lib/web_ui/lib/src/engine/window.dart b/lib/web_ui/lib/src/engine/window.dart
index 47a1215fd1f9b..810e1a6ef11b3 100644
--- a/lib/web_ui/lib/src/engine/window.dart
+++ b/lib/web_ui/lib/src/engine/window.dart
@@ -30,8 +30,8 @@ const bool debugPrintPlatformMessages = false;
 const int kImplicitViewId = 0;
 
 /// The Web implementation of [ui.SingletonFlutterWindow].
-class EngineFlutterWindow extends ui.SingletonFlutterWindow {
-  EngineFlutterWindow(this.viewId, this.platformDispatcher) {
+class EngineSingletonFlutterWindow extends ui.SingletonFlutterWindow {
+  EngineSingletonFlutterWindow(this.viewId, this.platformDispatcher) {
     platformDispatcher.viewData[viewId] = this;
     platformDispatcher.windowConfigurations[viewId] = const ViewConfiguration();
     if (ui_web.isCustomUrlStrategySet) {
@@ -366,8 +366,10 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow {
 /// `dart:ui` window delegates to this value. However, this value has a wider
 /// API surface, providing Web-specific functionality that the standard
 /// `dart:ui` version does not.
-final EngineFlutterWindow window =
-    EngineFlutterWindow(kImplicitViewId, EnginePlatformDispatcher.instance);
+final EngineSingletonFlutterWindow window = EngineSingletonFlutterWindow(
+  kImplicitViewId,
+  EnginePlatformDispatcher.instance,
+);
 
 /// The Web implementation of [ui.ViewPadding].
 class ViewPadding implements ui.ViewPadding {
diff --git a/lib/web_ui/lib/ui_web/src/ui_web/testing.dart b/lib/web_ui/lib/ui_web/src/ui_web/testing.dart
index 239bca8c53ca7..507d81b63db4f 100644
--- a/lib/web_ui/lib/ui_web/src/ui_web/testing.dart
+++ b/lib/web_ui/lib/ui_web/src/ui_web/testing.dart
@@ -8,7 +8,7 @@ import 'package:ui/ui.dart' as ui;
 extension SingletonFlutterWindowExtension on ui.SingletonFlutterWindow {
   /// Overrides the value of [physicalSize] in tests.
   set debugPhysicalSizeOverride(ui.Size? value) {
-    (this as EngineFlutterWindow).debugPhysicalSizeOverride = value;
+    (this as EngineSingletonFlutterWindow).debugPhysicalSizeOverride = value;
   }
 }
 
diff --git a/lib/web_ui/test/engine/routing_test.dart b/lib/web_ui/test/engine/routing_test.dart
index 349a7ba9f70aa..ed09a11ea9813 100644
--- a/lib/web_ui/test/engine/routing_test.dart
+++ b/lib/web_ui/test/engine/routing_test.dart
@@ -27,14 +27,14 @@ void main() {
 }
 
 void testMain() {
-  late EngineFlutterWindow window;
+  late EngineSingletonFlutterWindow window;
 
   setUpAll(() async {
     await initializeEngine();
   });
 
   setUp(() {
-    window = EngineFlutterWindow(0, EnginePlatformDispatcher.instance);
+    window = EngineSingletonFlutterWindow(0, EnginePlatformDispatcher.instance);
   });
 
   tearDown(() async {
diff --git a/lib/web_ui/test/engine/surface/platform_view_test.dart b/lib/web_ui/test/engine/surface/platform_view_test.dart
index 721216e2d1fd4..ee37dbb532d88 100644
--- a/lib/web_ui/test/engine/surface/platform_view_test.dart
+++ b/lib/web_ui/test/engine/surface/platform_view_test.dart
@@ -13,7 +13,8 @@ import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 import '../../common/matchers.dart';
 
 const MethodCodec codec = StandardMethodCodec();
-final EngineFlutterWindow window = EngineFlutterWindow(0, EnginePlatformDispatcher.instance);
+final EngineSingletonFlutterWindow window =
+    EngineSingletonFlutterWindow(0, EnginePlatformDispatcher.instance);
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);