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
[web] Fix leaking canvas in text placeholder tests #21253
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -397,7 +397,8 @@ class TestCommand extends Command<bool> with ArgUtils { | |
// after solving the git issue faced on macOS and Windows bots: | ||
// TODO: https://github.com/flutter/flutter/issues/63710 | ||
if ((isChrome && isLuci && io.Platform.isLinux) || | ||
((isChrome || isSafariIOS) && !isLuci)) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can you remove this part for now :) I didn't merged the recipe change |
||
(isChrome && !isLuci) || (isSafariIOS && isLuci)) { | ||
print('INFO: Also running the screenshot tests.'); | ||
// Separate screenshot tests from unit-tests. Screenshot tests must run | ||
// one at a time. Otherwise, they will end up screenshotting each other. | ||
// This is not an issue for unit-tests. | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,6 +27,7 @@ void testMain() async { | |
final Rect screenRect = const Rect.fromLTWH(0, 0, 600, 600); | ||
final RecordingCanvas recordingCanvas = RecordingCanvas(screenRect); | ||
|
||
recordingCanvas.save(); | ||
Offset offset = Offset.zero; | ||
for (PlaceholderAlignment placeholderAlignment | ||
in PlaceholderAlignment.values) { | ||
|
@@ -39,6 +40,7 @@ void testMain() async { | |
); | ||
offset = offset.translate(0.0, 80.0); | ||
} | ||
recordingCanvas.restore(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i just see save/restore pairs. why was it leaking when restore is not called ? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Because of the way canvas pool works lazily now? I saw you added |
||
recordingCanvas.endRecording(); | ||
recordingCanvas.apply(canvas, screenRect); | ||
return scuba.diffCanvasScreenshot(canvas, 'text_with_placeholders'); | ||
|
@@ -48,6 +50,7 @@ void testMain() async { | |
final Rect screenRect = const Rect.fromLTWH(0, 0, 600, 600); | ||
final RecordingCanvas recordingCanvas = RecordingCanvas(screenRect); | ||
|
||
recordingCanvas.save(); | ||
Offset offset = Offset.zero; | ||
_paintTextWithPlaceholder( | ||
recordingCanvas, | ||
|
@@ -72,6 +75,7 @@ void testMain() async { | |
after: 'ipsum.', | ||
textAlignment: TextAlign.end, | ||
); | ||
recordingCanvas.restore(); | ||
recordingCanvas.endRecording(); | ||
recordingCanvas.apply(canvas, screenRect); | ||
return scuba.diffCanvasScreenshot(canvas, 'text_align_with_placeholders'); | ||
|
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.
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.
:D thanks!