This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Fix npe during skia dispatch of drawAtlas #55497
Merged
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
gaaclarke
suggested changes
Sep 27, 2024
| sk_colors.push_back(colors[i].argb()); | ||
| } | ||
| } | ||
| canvas_->drawAtlas(skia_atlas.get(), xform, ToSkRects(tex), sk_colors.data(), |
Member
There was a problem hiding this comment.
Unfortunately .data() is not guaranteed to return nullptr for empty std::vector. We need to explicitly send it here.
gaaclarke
approved these changes
Sep 27, 2024
Member
gaaclarke
left a comment
gaaclarke
left a comment
There was a problem hiding this comment.
lgtm, just a suggestion and a question
| canvas_->drawAtlas(skia_atlas.get(), xform, ToSkRects(tex), sk_colors.data(), | ||
| count, ToSk(mode), ToSk(sampling), ToSkRect(cullRect), | ||
| canvas_->drawAtlas(skia_atlas.get(), xform, ToSkRects(tex), | ||
| colors == nullptr ? nullptr : sk_colors.data(), count, |
Member
There was a problem hiding this comment.
Suggested change
| colors == nullptr ? nullptr : sk_colors.data(), count, | |
| sk_colors.empty() ? nullptr : sk_colors.data(), count, |
This is a more direct condition =)
testing/dart/canvas_test.dart
Outdated
|
|
||
| final Image resultImage = await recorder.endRecording().toImage(1, 1); | ||
| final ByteData? data = await resultImage.toByteData(); | ||
| if (data == null) { |
Contributor
Author
There was a problem hiding this comment.
Oh, I guess this is from old litetest days.
jonahwilliams
added
the
autosubmit
auto-submit
bot
removed
the
autosubmit
Contributor
|
auto label is removed for flutter/engine/55497, due to - The status or check suite Mac mac_host_engine has failed. Please fix the issues identified (or deflake) before re-applying this label. |
|
You were fast to correct the ticket, thanks!! |
gaaclarke
added
the
autosubmit
auto-submit
bot
removed
the
autosubmit
Contributor
|
auto label is removed for flutter/engine/55497, due to - The status or check suite Mac mac_host_engine has failed. Please fix the issues identified (or deflake) before re-applying this label. |
jonahwilliams
added
the
autosubmit
Contributor
Author
|
It's on master as soon as this PR rolls into the framework in a few hours. And there is no dev channel 😁 |
|
Used to be long time ago ;) |
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Sep 28, 2024
auto-submit bot
pushed a commit
to flutter/flutter
that referenced
this pull request
Sep 28, 2024
…155889) flutter/engine@ff45417...c4784aa 2024-09-28 [email protected] Fix npe during skia dispatch of drawAtlas (flutter/engine#55497) 2024-09-28 [email protected] Roll Skia from 7efc11f2ea9e to f88a9ae4d9c1 (2 revisions) (flutter/engine#55511) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
thejitenpatel
pushed a commit
to thejitenpatel/flutter
that referenced
this pull request
Oct 1, 2024
…lutter#155889) flutter/engine@ff45417...c4784aa 2024-09-28 [email protected] Fix npe during skia dispatch of drawAtlas (flutter/engine#55497) 2024-09-28 [email protected] Roll Skia from 7efc11f2ea9e to f88a9ae4d9c1 (2 revisions) (flutter/engine#55511) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Colors are optionally provided, so make sure to null check the array.
Fixes flutter/flutter#155783