catch errors from ImageDecoder constructor; close frames

Author: yjbanov

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

@@ -65,32 +65,33 @@ class CkBrowserImageDecoder implements ui.Codec {
  );
  }
 
- final _ImageDecoder webDecoder = _ImageDecoder(_ImageDecoderOptions(
- type: contentType,
- data: data,
+ try {
+ final _ImageDecoder webDecoder = _ImageDecoder(_ImageDecoderOptions(
+ type: contentType,
+ data: data,
 
- // Flutter always uses premultiplied alpha.
- premultiplyAlpha: 'premultiply',
- desiredWidth: targetWidth,
- desiredHeight: targetHeight,
+  // Flutter always uses premultiplied alpha.
+  premultiplyAlpha: 'premultiply',
+  desiredWidth: targetWidth,
+  desiredHeight: targetHeight,
 
- // "default" gives the browser the liberty to convert to display-appropriate
- // color space, typically SRGB, which is what we want.
- colorSpaceConversion: 'default',
+  // "default" gives the browser the liberty to convert to display-appropriate
+  // color space, typically SRGB, which is what we want.
+  colorSpaceConversion: 'default',
 
- // Flutter doesn't give the developer a way to customize this, so if this
- // is an animated image we should prefer the animated track.
- preferAnimation: true,
- ));
+  // Flutter doesn't give the developer a way to customize this, so if this
+  // is an animated image we should prefer the animated track.
+  preferAnimation: true,
+  ));
 
- try {
  await js_util.promiseToFuture<void>(webDecoder.tracks.ready);
 
  // Flutter doesn't have an API for progressive loading of images, so we
  // wait until the image is fully decoded.
  // package:js bindings don't work with getters that return a Promise, which
  // is why js_util is used instead.
  await js_util.promiseToFuture<void>(js_util.getProperty(webDecoder, 'completed'));
+ return CkBrowserImageDecoder._(webDecoder, debugSource);
  } catch (error) {
  if (error is html.DomException) {
  if (error.name == html.DomException.NOT_SUPPORTED) {
@@ -106,7 +107,6 @@ class CkBrowserImageDecoder implements ui.Codec {
  'Original browser error: $error'
  );
  }
- return CkBrowserImageDecoder._(webDecoder, debugSource);
  }
 
  CkBrowserImageDecoder._(this.webDecoder, this.debugSource);
@@ -164,6 +164,13 @@ class CkBrowserImageDecoder implements ui.Codec {
  frame.displayWidth,
  frame.displayHeight,
  );
+ // Duration can be null if the image is not animated. However, Flutter
+ // requires a non-null value. 0 indicates that the frame is meant to be
+ // displayed indefinitely, which is fine for a static image.
+ final Duration duration = Duration(microseconds: frame.duration ?? 0);
+
+ // Do not use the `frame` variable after this line.
+ frame.close();
 
  if (skImage == null) {
  throw ImageCodecException(
@@ -172,12 +179,6 @@ class CkBrowserImageDecoder implements ui.Codec {
  }
 
  final CkImage image = CkImage(skImage);
-
- // Duration can be null if the image is not animated. However, Flutter
- // requires a non-null value. 0 indicates that the frame is meant to be
- // displayed indefinitely, which is fine for a static image.
- final Duration duration = Duration(microseconds: frame.duration ?? 0);
-
  return Future<ui.FrameInfo>.value(AnimatedImageFrameInfo(duration, image));
  }
 
@@ -254,6 +255,7 @@ class _VideoFrame {
  external int get displayWidth;
  external int get displayHeight;
  external int? get duration;
+ external void close();
 }
 
 /// Corresponds to the browser's `ImageTrackList` type.