fix batch 3

Author: yjbanov

lib/web_ui/lib/src/engine/platform_dispatcher.dart

@@ -461,7 +461,7 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
       case 'flutter/mousecursor':
         const MethodCodec codec = StandardMethodCodec();
         final MethodCall decoded = codec.decodeMethodCall(data);
-        final Map<String, dynamic> arguments = decoded.arguments as Map<String, dynamic>;
+        final Map<dynamic, dynamic> arguments = decoded.arguments as Map<dynamic, dynamic>;
         switch (decoded.method) {
           case 'activateSystemCursor':
             MouseCursor.instance!.activateSystemCursor(arguments.tryString('kind'));

lib/web_ui/lib/src/engine/text/paragraph.dart

@@ -1372,7 +1372,7 @@ class DomParagraphBuilder implements ui.ParagraphBuilder {
     // entirely. Occasionally there will be one [pushStyle], which causes this
     // loop to run once then move on to aggregating text.
     while (i < _ops.length && _ops[i] is EngineTextStyle) {
-      final EngineTextStyle style = _ops[i];
+      final EngineTextStyle style = _ops[i] as EngineTextStyle;
       if (style.color != null) {
         color = style.color!;
       }
@@ -1554,8 +1554,8 @@ class DomParagraphBuilder implements ui.ParagraphBuilder {
 
   /// Builds a [Paragraph] as rich text.
   EngineParagraph _buildRichText() {
-    final List<dynamic> elementStack = <dynamic>[];
-    dynamic currentElement() =>
+    final List<html.Element> elementStack = <html.Element>[];
+    html.Element currentElement() =>
         elementStack.isNotEmpty ? elementStack.last : _paragraphElement;
 
     for (int i = 0; i < _ops.length; i++) {

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

@@ -21,6 +21,7 @@ import 'navigation/url_strategy.dart';
 import 'platform_dispatcher.dart';
 import 'services.dart';
 import 'test_embedding.dart';
+import 'util.dart';
 
 typedef _HandleMessageCallBack = Future<bool> Function();
 
@@ -152,7 +153,7 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow {
   Future<bool> handleNavigationMessage(ByteData? data) async {
     return _waitInTheLine(() async {
       final MethodCall decoded = const JSONMethodCodec().decodeMethodCall(data);
-      final Map<String, dynamic>? arguments = decoded.arguments;
+      final Map<String, dynamic>? arguments = decoded.arguments as Map<String, dynamic>?;
       switch (decoded.method) {
         case 'selectMultiEntryHistory':
           await _useMultiEntryBrowserHistory();
@@ -164,14 +165,14 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow {
         case 'routeUpdated': // deprecated
           assert(arguments != null);
           await _useSingleEntryBrowserHistory();
-          browserHistory.setRouteName(arguments!['routeName']);
+          browserHistory.setRouteName(arguments!.tryString('routeName'));
           return true;
         case 'routeInformationUpdated':
           assert(arguments != null);
           browserHistory.setRouteName(
-            arguments!['location'],
-            state: arguments['state'],
-            replace: arguments['replace'] ?? false,
+            arguments!.tryString('location'),
+            state: arguments.tryString('state'),
+            replace: arguments.tryBool('replace') ?? false,
           );
           return true;
       }

lib/web_ui/test/clipboard_test.dart

@@ -40,7 +40,7 @@ Future<void> testMain() async {
       const MethodCodec codec = JSONMethodCodec();
       final Completer<bool> completer = Completer<bool>();
       void callback(ByteData? data) {
-        completer.complete(codec.decodeEnvelope(data!));
+        completer.complete(codec.decodeEnvelope(data!) as bool);
       }
 
       clipboardMessageHandler.setDataMethodCall(
@@ -78,7 +78,7 @@ Future<void> testMain() async {
       const MethodCodec codec = JSONMethodCodec();
       final Completer<Map<String, dynamic>> completer = Completer<Map<String, dynamic>>();
       void callback(ByteData? data) {
-        completer.complete(codec.decodeEnvelope(data!));
+        completer.complete(codec.decodeEnvelope(data!) as Map<String, dynamic>);
       }
 
       clipboardMessageHandler.getDataMethodCall(callback);

lib/web_ui/test/engine/pointer_binding_test.dart

@@ -2325,7 +2325,7 @@ mixin _ButtonedEventMixin on _BasicEventContext {
     required double? deltaX,
     required double? deltaY,
   }) {
-    final Function jsWheelEvent = js_util.getProperty(html.window, 'WheelEvent');
+    final Function jsWheelEvent = js_util.getProperty(html.window, 'WheelEvent') as Function;
     final List<dynamic> eventArgs = <dynamic>[
       'wheel',
       <String, dynamic>{
@@ -2336,7 +2336,10 @@ mixin _ButtonedEventMixin on _BasicEventContext {
         'deltaY': deltaY,
       }
     ];
-    return js_util.callConstructor(jsWheelEvent, js_util.jsify(eventArgs));
+    return js_util.callConstructor(
+      jsWheelEvent,
+      js_util.jsify(eventArgs) as List<Object?>,
+    ) as html.Event;
   }
 }
 
@@ -2550,7 +2553,7 @@ class _MouseEventContext extends _BasicEventContext
     double? clientY,
   }) {
     final Function jsMouseEvent =
-        js_util.getProperty(html.window, 'MouseEvent');
+        js_util.getProperty(html.window, 'MouseEvent') as Function;
     final List<dynamic> eventArgs = <dynamic>[
       type,
       <String, dynamic>{
@@ -2560,7 +2563,10 @@ class _MouseEventContext extends _BasicEventContext
         'clientY': clientY,
       }
     ];
-    return js_util.callConstructor(jsMouseEvent, js_util.jsify(eventArgs));
+    return js_util.callConstructor(
+      jsMouseEvent,
+      js_util.jsify(eventArgs) as List<Object?>,
+    ) as html.MouseEvent;
   }
 }
 

lib/web_ui/test/engine/profiler_test.dart

@@ -77,8 +77,9 @@ void _profilerTests() {
     expect(data, isEmpty);
 
     // Not even a callback.
+    jsOnBenchmark('string');
     expect(
-      () => jsOnBenchmark('string'),
+      () => Profiler.instance.benchmark('foo', 123),
       throwsA(isA<TypeError>()),
     );
   });
@@ -159,5 +160,11 @@ class BenchmarkDatapoint {
 }
 
 void jsOnBenchmark(dynamic listener) {
-  js_util.setProperty(html.window, '_flutter_internal_on_benchmark', listener != null ? js.allowInterop(listener) : null);
+  js_util.setProperty(
+    html.window,
+    '_flutter_internal_on_benchmark',
+    listener is Function
+      ? js.allowInterop(listener)
+      : listener,
+  );
 }

lib/web_ui/test/engine/surface/scene_builder_test.dart

@@ -918,6 +918,6 @@ HtmlImage createTestImage({int width = 100, int height = 50}) {
   ctx.fillRect(66, 0, 33, 50);
   ctx.fill();
   final html.ImageElement imageElement = html.ImageElement();
-  imageElement.src = js_util.callMethod(canvas, 'toDataURL', <dynamic>[]);
+  imageElement.src = js_util.callMethod(canvas, 'toDataURL', <dynamic>[]) as String;
   return HtmlImage(imageElement, width, height);
 }

lib/web_ui/test/html/canvas_clip_path_golden_test.dart

@@ -140,6 +140,6 @@ engine.HtmlImage createTestImage({int width = 200, int height = 150}) {
   ctx.fillRect(2 * width / 3, 0, width / 3, height);
   ctx.fill();
   final html.ImageElement imageElement = html.ImageElement();
-  imageElement.src = js_util.callMethod(canvas, 'toDataURL', <dynamic>[]);
+  imageElement.src = js_util.callMethod(canvas, 'toDataURL', <dynamic>[]) as String;
   return engine.HtmlImage(imageElement, width, height);
 }

lib/web_ui/test/html/compositing/canvas_blend_golden_test.dart

@@ -120,6 +120,6 @@ HtmlImage createTestImage() {
   ctx.fillRect(66, 0, 33, 50);
   ctx.fill();
   final html.ImageElement imageElement = html.ImageElement();
-  imageElement.src = js_util.callMethod(canvas, 'toDataURL', <dynamic>[]);
+  imageElement.src = js_util.callMethod(canvas, 'toDataURL', <dynamic>[]) as String;
   return HtmlImage(imageElement, width, height);
 }

lib/web_ui/test/html/compositing/color_filter_golden_test.dart

@@ -189,6 +189,6 @@ HtmlImage createTestImage({int width = 200, int height = 150}) {
   ctx.fillRect(2 * width / 3, 0, width / 3, height);
   ctx.fill();
   final html.ImageElement imageElement = html.ImageElement();
-  imageElement.src = js_util.callMethod(canvas, 'toDataURL', <dynamic>[]);
+  imageElement.src = js_util.callMethod(canvas, 'toDataURL', <dynamic>[]) as String;
   return HtmlImage(imageElement, width, height);
 }