Remove additional instances

Author: gspencergoog

analysis_options.yaml

@@ -7,7 +7,7 @@
 #  - "sort_constructors_first" disabled (because we have private fake
 #     constructors),
 #  - "prefer_final_fields" disabled (because we do weird things with
-#    private fields, especially on the Window object):
+#    private fields, especially on the PlatformDispatcher object):
 
 analyzer:
   enable-experiment:

common/settings.h

@@ -221,11 +221,11 @@ struct Settings {
   FrameRasterizedCallback frame_rasterized_callback;
 
   // This data will be available to the isolate immediately on launch via the
-  // Window.getPersistentIsolateData callback. This is meant for information
-  // that the isolate cannot request asynchronously (platform messages can be
-  // used for that purpose). This data is held for the lifetime of the shell and
-  // is available on isolate restarts in the shell instance. Due to this,
-  // the buffer must be as small as possible.
+  // PlatformDispatcher.getPersistentIsolateData callback. This is meant for
+  // information that the isolate cannot request asynchronously (platform
+  // messages can be used for that purpose). This data is held for the lifetime
+  // of the shell and is available on isolate restarts in the shell instance.
+  // Due to this, the buffer must be as small as possible.
   std::shared_ptr<const fml::Mapping> persistent_isolate_data;
 
   /// Max size of old gen heap size in MB, or 0 for unlimited, -1 for default

lib/web_ui/lib/src/engine/dom_renderer.dart

@@ -478,8 +478,8 @@ flt-glass-pane * {
   ///
   /// When there is a text editing going on in mobile devices, do not change
   /// the physicalSize, change the [window.viewInsets]. See:
-  /// https://api.flutter.dev/flutter/dart-ui/Window/viewInsets.html
-  /// https://api.flutter.dev/flutter/dart-ui/Window/physicalSize.html
+  /// https://api.flutter.dev/flutter/dart-ui/FlutterView/viewInsets.html
+  /// https://api.flutter.dev/flutter/dart-ui/FlutterView/physicalSize.html
   ///
   /// Note: always check for rotations for a mobile device. Update the physical
   /// size if the change is caused by a rotation.

lib/web_ui/lib/src/engine/semantics/semantics.dart

@@ -1265,11 +1265,11 @@ class EngineSemanticsOwner {
 
   final SemanticsHelper semanticsHelper = SemanticsHelper();
 
-  /// Whether the user has requested that [updateSemantics] be called when
-  /// the semantic contents of window changes.
+  /// Whether the user has requested that [updateSemantics] be called when the
+  /// semantic contents of window changes.
   ///
-  /// The [ui.Window.onSemanticsEnabledChanged] callback is called whenever this
-  /// value changes.
+  /// The [ui.PlatformDispatcher.onSemanticsEnabledChanged] callback is called
+  /// whenever this value changes.
   ///
   /// This is separate from accessibility [mode], which controls how gestures
   /// are interpreted when this value is true.

lib/web_ui/lib/src/engine/window.dart

@@ -22,10 +22,8 @@ set customUrlStrategy(UrlStrategy? strategy) {
   _customUrlStrategy = strategy;
 }
 
-/// The Web implementation of [ui.Window].
-// TODO(gspencergoog): Once the framework no longer uses ui.Window, make this extend
-// ui.SingletonFlutterWindow instead.
-class EngineFlutterWindow extends ui.Window {
+/// The Web implementation of [ui.SingletonFlutterWindow].
+class EngineFlutterWindow extends ui.SingletonFlutterWindow {
   EngineFlutterWindow(this._windowId, this.platformDispatcher) {
     final EnginePlatformDispatcher engineDispatcher = platformDispatcher as EnginePlatformDispatcher;
     engineDispatcher._windows[_windowId] = this;
@@ -245,7 +243,7 @@ UrlStrategy? _createDefaultUrlStrategy() {
       : const HashUrlStrategy();
 }
 
-/// The Web implementation of [ui.Window].
+/// The Web implementation of [ui.SingletonFlutterWindow].
 class EngineSingletonFlutterWindow extends EngineFlutterWindow {
   EngineSingletonFlutterWindow(Object windowId, ui.PlatformDispatcher platformDispatcher) : super(windowId, platformDispatcher);
 

lib/web_ui/lib/src/ui/window.dart

@@ -124,138 +124,6 @@ abstract class SingletonFlutterWindow extends FlutterWindow {
   void setIsolateDebugName(String name) => PlatformDispatcher.instance.setIsolateDebugName(name);
 }
 
-// This class will go away entirely once references to it are removed from the
-// framework. The many explicit overrides are an artifact of needing to add the
-// same overrides to the one in dart:ui in order to get dartdoc to find the docs
-// for them.
-abstract class Window extends SingletonFlutterWindow {
-  @override
-  double get devicePixelRatio;
-
-  @override
-  Rect get physicalGeometry;
-
-  @override
-  Size get physicalSize;
-
-  @override
-  WindowPadding get viewInsets;
-
-  @override
-  WindowPadding get viewPadding;
-
-  @override
-  WindowPadding get systemGestureInsets;
-
-  @override
-  WindowPadding get padding;
-
-  @override
-  void render(Scene scene);
-
-  @override
-  VoidCallback? get onMetricsChanged;
-  @override
-  set onMetricsChanged(VoidCallback? callback);
-
-  @override
-  Locale? get locale => super.locale;
-
-  @override
-  List<Locale>? get locales => super.locales;
-
-  @override
-  Locale? computePlatformResolvedLocale(List<Locale> supportedLocales);
-
-  @override
-  VoidCallback? get onLocaleChanged;
-  @override
-  set onLocaleChanged(VoidCallback? callback);
-
-  @override
-  String get initialLifecycleState;
-
-  @override
-  double get textScaleFactor;
-
-  @override
-  bool get alwaysUse24HourFormat;
-
-  @override
-  VoidCallback? get onTextScaleFactorChanged;
-  @override
-  set onTextScaleFactorChanged(VoidCallback? callback);
-
-  @override
-  Brightness get platformBrightness;
-
-  @override
-  VoidCallback? get onPlatformBrightnessChanged;
-  @override
-  set onPlatformBrightnessChanged(VoidCallback? callback);
-
-  @override
-  FrameCallback? get onBeginFrame;
-  @override
-  set onBeginFrame(FrameCallback? callback);
-
-  @override
-  VoidCallback? get onDrawFrame;
-  @override
-  set onDrawFrame(VoidCallback? callback);
-
-  @override
-  TimingsCallback? get onReportTimings;
-  @override
-  set onReportTimings(TimingsCallback? callback);
-
-  @override
-  PointerDataPacketCallback? get onPointerDataPacket;
-  @override
-  set onPointerDataPacket(PointerDataPacketCallback? callback);
-
-  @override
-  String get defaultRouteName;
-
-  @override
-  void scheduleFrame();
-
-  @override
-  bool get semanticsEnabled;
-
-  @override
-  VoidCallback? get onSemanticsEnabledChanged;
-  @override
-  set onSemanticsEnabledChanged(VoidCallback? callback);
-
-  @override
-  SemanticsActionCallback? get onSemanticsAction;
-  @override
-  set onSemanticsAction(SemanticsActionCallback? callback);
-
-  @override
-  AccessibilityFeatures get accessibilityFeatures;
-
-  @override
-  VoidCallback? get onAccessibilityFeaturesChanged;
-  @override
-  set onAccessibilityFeaturesChanged(VoidCallback? callback);
-
-  @override
-  void updateSemantics(SemanticsUpdate update);
-
-  @override
-  void sendPlatformMessage(String name, ByteData? data, PlatformMessageResponseCallback? callback);
-
-  @override
-  PlatformMessageCallback? get onPlatformMessage;
-  @override
-  set onPlatformMessage(PlatformMessageCallback? callback);
-
-  @override
-  void setIsolateDebugName(String name);
-}
-
 class AccessibilityFeatures {
   const AccessibilityFeatures._(this._index);
 
@@ -368,4 +236,4 @@ class IsolateNameServer {
   }
 }
 
-Window get window => engine.window;
+SingletonFlutterWindow window => engine.window;

lib/web_ui/test/engine/window_test.dart

@@ -271,7 +271,7 @@ void testMain() {
     expect(responded, true);
   });
 
-  test('Window implements locale, locales, and locale change notifications', () async {
+  test('SingletonFlutterWindow implements locale, locales, and locale change notifications', () async {
     // This will count how many times we notified about locale changes.
     int localeChangedCount = 0;
     window.onLocaleChanged = () {