This repository was archived by the owner on Feb 25, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6k
[CanvasKit] Dispose the overlay surface when a platform view is disposed #19546
Merged
harryterkelsen
merged 1 commit into
flutter:master
from
harryterkelsen:canvaskit-dispose-overlay-surface
Jul 7, 2020
Merged
[CanvasKit] Dispose the overlay surface when a platform view is disposed #19546
harryterkelsen
merged 1 commit into
flutter:master
from
harryterkelsen:canvaskit-dispose-overlay-surface
Jul 7, 2020
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat. Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. |
yjbanov
approved these changes
Jul 7, 2020
@@ -369,6 +370,8 @@ class HtmlViewEmbedder { | |||
if (_overlays[viewId] != null) { | |||
final Overlay overlay = _overlays[viewId]!; | |||
overlay.surface.htmlElement?.remove(); | |||
overlay.surface.htmlElement = null; | |||
overlay.skSurface?.dispose(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we also null it out?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't because skSurface
is final
. It should be garbage collected anyways after overlay
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Jul 8, 2020
dnfield
pushed a commit
to flutter/flutter
that referenced
this pull request
Jul 8, 2020
* a53782f Roll Skia from 6130d5079d55 to 0c0d8dd6d637 (3 revisions) (flutter/engine#19570) * 0541502 kick build (flutter/engine#19575) * 07d5090 Roll Skia from 0c0d8dd6d637 to cf5e35f72130 (13 revisions) (flutter/engine#19573) * 35b5aa5 switch const finder to package_config (flutter/engine#19576) * de0932b Manual roll of Dart 06cb010247...69aba23371 (flutter/engine#19577) * b919945 include list_libraries.dart as a snapshot for fuchsia (flutter/engine#19567) * 3fe5edf Roll Skia from cf5e35f72130 to b4d60f807dbd (5 revisions) (flutter/engine#19587) * a15bc1b [CanvasKit] Dispose the overlay surface when a platform view is disposed (flutter/engine#19546) * 0dc86cd Only attempt surface creation in viewDidLayoutSubviews if the application is active. (flutter/engine#19592)
srujzs
pushed a commit
to srujzs/engine
that referenced
this pull request
Jul 9, 2020
mingwandroid
pushed a commit
to mingwandroid/flutter
that referenced
this pull request
Sep 6, 2020
* a53782f Roll Skia from 6130d5079d55 to 0c0d8dd6d637 (3 revisions) (flutter/engine#19570) * 0541502 kick build (flutter/engine#19575) * 07d5090 Roll Skia from 0c0d8dd6d637 to cf5e35f72130 (13 revisions) (flutter/engine#19573) * 35b5aa5 switch const finder to package_config (flutter/engine#19576) * de0932b Manual roll of Dart 06cb010247...69aba23371 (flutter/engine#19577) * b919945 include list_libraries.dart as a snapshot for fuchsia (flutter/engine#19567) * 3fe5edf Roll Skia from cf5e35f72130 to b4d60f807dbd (5 revisions) (flutter/engine#19587) * a15bc1b [CanvasKit] Dispose the overlay surface when a platform view is disposed (flutter/engine#19546) * 0dc86cd Only attempt surface creation in viewDidLayoutSubviews if the application is active. (flutter/engine#19592)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
When we disposed of platform views previously, we weren't disposing of the associated SkSurface.
Related Issues
Fixes flutter/flutter#50721
Checklist
Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes (
[x]
). This will ensure a smooth and quick review process.Breaking Change
Did any tests fail when you ran them? Please read handling breaking changes.