diff --git a/lib/web_ui/lib/src/engine/platform_dispatcher.dart b/lib/web_ui/lib/src/engine/platform_dispatcher.dart index e2ddae4ff0e0a..72cec86007ff1 100644 --- a/lib/web_ui/lib/src/engine/platform_dispatcher.dart +++ b/lib/web_ui/lib/src/engine/platform_dispatcher.dart @@ -171,7 +171,8 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher { /// * [PlatformDisptacher.views] for a list of all [FlutterView]s provided /// by the platform. @override - EngineFlutterWindow? get implicitView => viewData[kImplicitViewId] as EngineFlutterWindow?; + EngineSingletonFlutterWindow? get implicitView => + viewData[kImplicitViewId] as EngineSingletonFlutterWindow?; /// A callback that is invoked whenever the platform's [devicePixelRatio], /// [physicalSize], [padding], [viewInsets], or [systemGestureInsets] diff --git a/lib/web_ui/lib/src/engine/window.dart b/lib/web_ui/lib/src/engine/window.dart index 0dd502def1627..a94d931b1823b 100644 --- a/lib/web_ui/lib/src/engine/window.dart +++ b/lib/web_ui/lib/src/engine/window.dart @@ -41,8 +41,8 @@ abstract interface class EngineFlutterView extends ui.FlutterView { } /// The Web implementation of [ui.SingletonFlutterWindow]. -class EngineFlutterWindow extends ui.SingletonFlutterWindow implements EngineFlutterView { - EngineFlutterWindow(this.viewId, this.platformDispatcher) { +class EngineSingletonFlutterWindow extends ui.SingletonFlutterWindow implements EngineFlutterView { + EngineSingletonFlutterWindow(this.viewId, this.platformDispatcher) { platformDispatcher.viewData[viewId] = this; platformDispatcher.windowConfigurations[viewId] = const ViewConfiguration(); if (ui_web.isCustomUrlStrategySet) { @@ -383,8 +383,10 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow implements EngineFlu /// `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);