Remove single-window assumption from scenario_app (flutter#40156)

Remove single-window assumption from scenario_app
matanlurey · Mar 9, 2023 · 7e0e65a · 7e0e65a
1 parent 347a4f3
commit 7e0e65a
Show file tree

Hide file tree

Showing 16 changed files with 236 additions and 276 deletions.
diff --git a/testing/scenario_app/ios/Runner/GeneratedPluginRegistrant.h b/testing/scenario_app/ios/Runner/GeneratedPluginRegistrant.h
@@ -2,6 +2,8 @@
 //  Generated file. Do not edit.
 //
 
+// clang-format off
+
 #ifndef GeneratedPluginRegistrant_h
 #define GeneratedPluginRegistrant_h
 

diff --git a/testing/scenario_app/ios/Runner/GeneratedPluginRegistrant.m b/testing/scenario_app/ios/Runner/GeneratedPluginRegistrant.m
@@ -2,6 +2,8 @@
 //  Generated file. Do not edit.
 //
 
+// clang-format off
+
 #import "GeneratedPluginRegistrant.h"
 
 @implementation GeneratedPluginRegistrant

diff --git a/testing/scenario_app/lib/main.dart b/testing/scenario_app/lib/main.dart
@@ -12,7 +12,11 @@ import 'dart:ui';
 import 'src/scenarios.dart';
 
 void main() {
-  window
+  // TODO(goderbauer): Create a window if embedder doesn't provide an implicit
+  //   view to draw into once we have a windowing API and set the window's
+  //   FlutterView to the _view property.
+  assert(PlatformDispatcher.instance.implicitView != null);
+  PlatformDispatcher.instance
     ..onPlatformMessage = _handlePlatformMessage
     ..onBeginFrame = _onBeginFrame
     ..onDrawFrame = _onDrawFrame
@@ -22,15 +26,18 @@ void main() {
 
   final ByteData data = ByteData(1);
   data.setUint8(0, 1);
-  window.sendPlatformMessage('waiting_for_status', data, null);
+  PlatformDispatcher.instance.sendPlatformMessage('waiting_for_status', data, null);
 }
 
+/// The FlutterView into which the [Scenario]s will be rendered.
+FlutterView get _view => PlatformDispatcher.instance.implicitView!;
+
 void _handleDriverMessage(Map<String, dynamic> call) {
   final String? methodName = call['method'] as String?;
   switch (methodName) {
     case 'set_scenario':
       assert(call['args'] != null);
-      loadScenario(call['args'] as Map<String, dynamic>);
+      loadScenario(call['args'] as Map<String, dynamic>, _view);
     break;
     default:
       throw 'Unimplemented method: $methodName.';
@@ -86,7 +93,7 @@ void _onBeginFrame(Duration duration) {
   if (currentScenario == null) {
     final SceneBuilder builder = SceneBuilder();
     final Scene scene = builder.build();
-    window.render(scene);
+    _view.render(scene);
     scene.dispose();
     return;
   }

diff --git a/testing/scenario_app/lib/src/animated_color_square.dart b/testing/scenario_app/lib/src/animated_color_square.dart
@@ -14,21 +14,18 @@ import 'scenario.dart';
 /// that are constantly changing.
 class AnimatedColorSquareScenario extends Scenario {
   /// Creates the AnimatedColorSquare scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
-  AnimatedColorSquareScenario(PlatformDispatcher dispatcher)
-      : super(dispatcher);
+  AnimatedColorSquareScenario(super.view);
 
   static const double _squareSize = 200;
   /// Used to animate the red value in the color of the square.
   final _NumberSwinger<int> _r = _NumberSwinger<int>(0, 255);
-  _NumberSwinger<double> _top = _NumberSwinger<double>(
+  late _NumberSwinger<double> _top = _NumberSwinger<double>(
     0,
-    window.physicalSize.height - _squareSize,
+    view.physicalSize.height - _squareSize,
   );
-  _NumberSwinger<double> _left = _NumberSwinger<double>(
+  late _NumberSwinger<double> _left = _NumberSwinger<double>(
     0,
-    window.physicalSize.width - _squareSize,
+    view.physicalSize.width - _squareSize,
   );
 
   @override
@@ -50,26 +47,26 @@ class AnimatedColorSquareScenario extends Scenario {
       willChangeHint: true,
     );
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
     scene.dispose();
   }
 
   @override
   void onDrawFrame() {
-    window.scheduleFrame();
+    view.platformDispatcher.scheduleFrame();
   }
 
   @override
   void onMetricsChanged() {
     _top = _NumberSwinger<double>(
       0,
-      window.physicalSize.height - _squareSize,
-      math.min(_top.current, window.physicalSize.height - _squareSize),
+      view.physicalSize.height - _squareSize,
+      math.min(_top.current, view.physicalSize.height - _squareSize),
     );
     _left = _NumberSwinger<double>(
       0,
-      window.physicalSize.width - _squareSize,
-      math.min(_left.current, window.physicalSize.width - _squareSize),
+      view.physicalSize.width - _squareSize,
+      math.min(_left.current, view.physicalSize.width - _squareSize),
     );
   }
 }

diff --git a/testing/scenario_app/lib/src/bogus_font_text.dart b/testing/scenario_app/lib/src/bogus_font_text.dart
@@ -11,10 +11,7 @@ import 'scenario.dart';
 /// system default font.
 class BogusFontText extends Scenario {
   /// Creates the BogusFontText scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
-  BogusFontText(PlatformDispatcher dispatcher)
-      : super(dispatcher);
+  BogusFontText(super.view);
 
   // Semi-arbitrary.
   final double _screenWidth = 700;
@@ -43,11 +40,11 @@ class BogusFontText extends Scenario {
       willChangeHint: true,
     );
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
     scene.dispose();
 
     sendJsonMessage(
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       channel: 'display_data',
       json: <String, dynamic>{
         'data': 'ready',

diff --git a/testing/scenario_app/lib/src/get_bitmap_scenario.dart b/testing/scenario_app/lib/src/get_bitmap_scenario.dart
@@ -9,26 +9,23 @@ import 'scenario.dart';
 /// A scenario with red on top and blue on the bottom.
 class GetBitmapScenario extends Scenario {
   /// Creates the GetBitmap scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
-  GetBitmapScenario(PlatformDispatcher dispatcher)
-      : super(dispatcher);
+  GetBitmapScenario(super.view);
 
   @override
   void onBeginFrame(Duration duration) {
     final PictureRecorder recorder = PictureRecorder();
     final Canvas canvas = Canvas(recorder);
-    canvas.drawRect(Rect.fromLTWH(0, 0, window.physicalSize.width, 300),
+    canvas.drawRect(Rect.fromLTWH(0, 0, view.physicalSize.width, 300),
         Paint()..color = const Color(0xFFFF0000));
     canvas.drawRect(
-        Rect.fromLTWH(0, window.physicalSize.height - 300,
-            window.physicalSize.width, 300),
+        Rect.fromLTWH(0, view.physicalSize.height - 300,
+            view.physicalSize.width, 300),
         Paint()..color = const Color(0xFF0000FF));
     final Picture picture = recorder.endRecording();
     final SceneBuilder builder = SceneBuilder();
     builder.addPicture(Offset.zero, picture);
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
     picture.dispose();
     scene.dispose();
   }

diff --git a/testing/scenario_app/lib/src/initial_route_reply.dart b/testing/scenario_app/lib/src/initial_route_reply.dart
@@ -2,26 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:ui';
-
 import 'channel_util.dart';
 import 'scenario.dart';
 
 /// A blank page that just sends back to the platform what the set initial
 /// route is.
 class InitialRouteReply extends Scenario {
   /// Creates the InitialRouteReply.
-  ///
-  /// The [window] parameter must not be null.
-  InitialRouteReply(PlatformDispatcher dispatcher)
-      : super(dispatcher);
+  InitialRouteReply(super.view);
 
   @override
   void onBeginFrame(Duration duration) {
     sendJsonMethodCall(
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       channel: 'initial_route_test_channel',
-      method: window.defaultRouteName,
+      method: view.platformDispatcher.defaultRouteName,
     );
   }
 }
diff --git a/testing/scenario_app/lib/src/locale_initialization.dart b/testing/scenario_app/lib/src/locale_initialization.dart
@@ -12,8 +12,7 @@ import 'scenario.dart';
 /// Sends the received locale data back as semantics information.
 class LocaleInitialization extends Scenario {
   /// Constructor
-  LocaleInitialization(PlatformDispatcher dispatcher)
-      : super(dispatcher);
+  LocaleInitialization(super.view);
 
   int _tapCount = 0;
 
@@ -26,7 +25,7 @@ class LocaleInitialization extends Scenario {
     final Canvas canvas = Canvas(recorder);
 
     canvas.drawRect(
-      Rect.fromLTWH(0, 0, window.physicalSize.width, window.physicalSize.height),
+      Rect.fromLTWH(0, 0, view.physicalSize.width, view.physicalSize.height),
       Paint()..color = const Color.fromARGB(255, 255, 255, 255),
     );
     final Picture picture = recorder.endRecording();
@@ -36,7 +35,7 @@ class LocaleInitialization extends Scenario {
       picture,
     );
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
     scene.dispose();
 
     // On the first frame, pretend that it drew a text field. Send the
@@ -50,7 +49,7 @@ class LocaleInitialization extends Scenario {
         // SemanticsAction.tap.
         actions: 1,
         rect: const Rect.fromLTRB(0.0, 0.0, 414.0, 48.0),
-        label: window.locales.toString(),
+        label: view.platformDispatcher.locales.toString(),
         labelAttributes: <StringAttribute>[],
         textDirection: TextDirection.ltr,
         textSelectionBase: -1,
@@ -82,7 +81,7 @@ class LocaleInitialization extends Scenario {
 
     final SemanticsUpdate semanticsUpdate = semanticsUpdateBuilder.build();
 
-    dispatcher.views.first.updateSemantics(semanticsUpdate);
+    view.updateSemantics(semanticsUpdate);
   }
 
   /// Handle taps.
@@ -140,7 +139,7 @@ class LocaleInitialization extends Scenario {
 
     final SemanticsUpdate semanticsUpdate = semanticsUpdateBuilder.build();
 
-    dispatcher.views.first.updateSemantics(semanticsUpdate);
+    view.updateSemantics(semanticsUpdate);
 
     _tapCount++;
   }

diff --git a/testing/scenario_app/lib/src/platform_echo_mixin.dart b/testing/scenario_app/lib/src/platform_echo_mixin.dart
@@ -16,6 +16,6 @@ mixin PlatformEchoMixin on Scenario {
     ByteData? data,
     PlatformMessageResponseCallback? callback,
   ) {
-    window.sendPlatformMessage(name, data, null);
+    view.platformDispatcher.sendPlatformMessage(name, data, null);
   }
 }