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

fix null access for CkParagraph.dispose #35815

Merged
auto-submit merged 2 commits into from
Aug 31, 2022
Merged

fix null access for CkParagraph.dispose #35815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f09015
fix null access for CkParagraph.dispose
dnfield Aug 30, 2022
e542fed
null after delete
dnfield Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/web_ui/lib/src/engine/canvaskit/text.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,8 @@ class CkParagraph extends SkiaObject<SkParagraph> implements ui.Paragraph {

@override
void delete() {
_skParagraph!.delete();
_skParagraph?.delete();
_skParagraph = null;
}

@override
Expand Down
12 changes: 12 additions & 0 deletions lib/web_ui/test/canvaskit/canvaskit_api_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1342,6 +1342,18 @@ void _canvasTests() {
);
});

test('Paragraph dispose', () {
final CkParagraphBuilder builder = CkParagraphBuilder(
CkParagraphStyle(),
);
builder.addText('Hello');
final CkParagraph paragraph = builder.build();

paragraph.delete();
paragraph.dispose();
expect(paragraph.debugDisposed, true);
});

test('toImage.toByteData', () async {
// Pretend that FinalizationRegistry is supported, so we can run this
// test in older browsers (the test will use a TestCollector instead of
Expand Down