Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit b59afdf

Browse files
Dispose pictures created in HtmlViewEmbedder.submitFrame (#57102)
See flutter/flutter#153678
1 parent 23c4966 commit b59afdf

File tree

2 files changed

+32
-0
lines changed

2 files changed

+32
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@ class HtmlViewEmbedder {
394394
.endRecording();
395395
await rasterizer.rasterizeToCanvas(
396396
renderCanvas.displayCanvas!, <CkPicture>[renderPicture]);
397+
renderPicture.dispose();
397398
}
398399

399400
for (final CkPictureRecorder recorder

lib/web_ui/test/canvaskit/embedded_views_test.dart

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ void testMain() {
3535
tearDown(() {
3636
PlatformViewManager.instance.debugClear();
3737
CanvasKitRenderer.instance.debugClear();
38+
Instrumentation.enabled = false;
3839
});
3940

4041
test('embeds interactive platform views', () async {
@@ -1574,6 +1575,36 @@ void testMain() {
15741575
expect(picturesPerCanvasInSecondRendering, <int>[19]);
15751576
debugOverrideJsConfiguration(null);
15761577
});
1578+
1579+
test('disposes render pictures', () async {
1580+
Instrumentation.enabled = true;
1581+
Instrumentation.instance.debugCounters.clear();
1582+
1583+
ui_web.platformViewRegistry.registerViewFactory(
1584+
'test-view',
1585+
(int viewId) => createDomHTMLDivElement()..className = 'platform-view',
1586+
);
1587+
1588+
CkPicture rectPicture(ui.Rect rect) {
1589+
return paintPicture(rect, (CkCanvas canvas) {
1590+
canvas.drawRect(
1591+
rect, CkPaint()..color = const ui.Color.fromARGB(255, 255, 0, 0));
1592+
});
1593+
}
1594+
final CkPicture picture = rectPicture(const ui.Rect.fromLTWH(0, 0, 20, 20));
1595+
1596+
await createPlatformView(0, 'test-view');
1597+
1598+
final LayerSceneBuilder sb = LayerSceneBuilder();
1599+
sb.addPicture(ui.Offset.zero, picture);
1600+
sb.addPlatformView(0, width: 20, height: 20);
1601+
final LayerScene scene = sb.build();
1602+
await renderScene(scene);
1603+
1604+
picture.dispose();
1605+
final Map<String, int> debugCounters = Instrumentation.instance.debugCounters;
1606+
expect(debugCounters['Picture Created'], debugCounters['Picture Deleted']);
1607+
});
15771608
});
15781609
}
15791610

0 commit comments

Comments
 (0)