Merge branch 'main' into diagnostics-r3

Author: matanlurey

DEPS

@@ -14,7 +14,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': 'b5ad5bf3696d91924e5e9a39d3ebe9b6c56ca260',
+  'skia_revision': '8db309541ad99394b7d6750b0c0ec8a3872abbc5',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,7 +56,7 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '5df6a6e0c037146eafd3b505647cb6115a3cd81f',
+  'dart_revision': 'efabc916307817f754f0273cb912d59c4101cb57',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: ffcfcfb7deb379c418ab887fed00374c
+Signature: d9d9d8dcf8eb70d3098e919af32d5a20
 
 ====================================================================================================
 LIBRARY: etc1

lib/web_ui/lib/src/engine/canvaskit/image.dart

@@ -130,6 +130,7 @@ class CkResizingCodec extends ResizingCodec {
       return image;
     }
 
+    image.dispose();
     return CkImage(skImage, imageSource: ImageBitmapImageSource(bitmap));
   }
 }

lib/web_ui/test/canvaskit/image_test.dart

@@ -21,6 +21,11 @@ void main() {
 void testMain() {
   setUpCanvasKitTest();
 
+  tearDown(() {
+    ui.Image.onCreate = null;
+    ui.Image.onDispose = null;
+  });
+
   test('toImage succeeds', () async {
     final ui.Image image = await _createImage();
     expect(image.runtimeType.toString(), equals('CkImage'));
@@ -44,8 +49,6 @@ void testMain() {
 
     expect(onCreateInvokedCount, 2);
     expect(createdImage, image2);
-
-    ui.Image.onCreate = null;
   });
 
   test('dispose() invokes onDispose once', () async {
@@ -65,8 +68,6 @@ void testMain() {
 
     expect(onDisposeInvokedCount, 2);
     expect(disposedImage, image2);
-
-    ui.Image.onDispose = null;
   });
 
   test('fetchImage fetches image in chunks', () async {
@@ -106,6 +107,30 @@ void testMain() {
     expect(size?.width, 600);
     expect(size?.height, 300);
   });
+
+  test('instantiateImageCodecWithSize disposes temporary image', () async {
+    final Set<ui.Image> activeImages = <ui.Image>{};
+    ui.Image.onCreate = activeImages.add;
+    ui.Image.onDispose = activeImages.remove;
+
+    final ui.Image image = await _createImage();
+    final ByteData? imageData = await image.toByteData(format: ui.ImageByteFormat.png);
+    final ui.ImmutableBuffer imageBuffer = await ui.ImmutableBuffer.fromUint8List(imageData!.buffer.asUint8List());
+    image.dispose();
+
+    final ui.Codec codec = await ui.instantiateImageCodecWithSize(
+      imageBuffer,
+      getTargetSize: (w, h) => ui.TargetImageSize(width: w ~/ 2, height: h ~/ 2)
+    );
+    final ui.FrameInfo frameInfo = await codec.getNextFrame();
+
+    expect(activeImages.length, 1);
+
+    frameInfo.image.dispose();
+    codec.dispose();
+
+    expect(activeImages.length, 0);
+  });
 }
 
 Future<ui.Image> _createImage() => _createPicture().toImage(10, 10);

sky/packages/sky_engine/LICENSE

@@ -31926,7 +31926,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
   This Source Code Form is "Incompatible With Secondary Licenses", as
   defined by the Mozilla Public License, v. 2.0.
 
-You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/5df6a6e0c037146eafd3b505647cb6115a3cd81f
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/efabc916307817f754f0273cb912d59c4101cb57
 /third_party/fallback_root_certificates/
 
 --------------------------------------------------------------------------------