Revert "Refactor JSNumber.toDart and Object.toJS" (flutter#43286)

Reverts flutter#43149 Reason for reverting: Broke the roll into the framework.
kjlubick · Jul 14, 2023 · f2f23db · f2f23db
1 parent 2aa58f4
commit f2f23db
Show file tree

Hide file tree

Showing 10 changed files with 173 additions and 168 deletions.
diff --git a/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart b/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
diff --git a/lib/web_ui/lib/src/engine/canvaskit/image.dart b/lib/web_ui/lib/src/engine/canvaskit/image.dart
@@ -205,10 +205,10 @@ Future<Uint8List> readChunked(HttpFetchPayload payload, int contentLength, WebOn
   int position = 0;
   int cumulativeBytesLoaded = 0;
   await payload.read<JSUint8Array1>((JSUint8Array1 chunk) {
-    cumulativeBytesLoaded += chunk.length.toDartInt;
+    cumulativeBytesLoaded += chunk.length.toDart.toInt();
     chunkCallback(cumulativeBytesLoaded, contentLength);
     result.set(chunk, position.toJS);
-    position += chunk.length.toDartInt;
+    position += chunk.length.toDart.toInt();
   });
   return result.toDart;
 }

diff --git a/lib/web_ui/lib/src/engine/configuration.dart b/lib/web_ui/lib/src/engine/configuration.dart
@@ -312,7 +312,7 @@ extension JsFlutterConfigurationExtension on JsFlutterConfiguration {
 
   @JS('canvasKitMaximumSurfaces')
   external JSNumber? get _canvasKitMaximumSurfaces;
-  double? get canvasKitMaximumSurfaces => _canvasKitMaximumSurfaces?.toDartDouble;
+  double? get canvasKitMaximumSurfaces => _canvasKitMaximumSurfaces?.toDart;
 
   @JS('debugShowSemanticsNodes')
   external JSBoolean? get _debugShowSemanticsNodes;