Fix npe during skia dispatch of drawAtlas #55497
Conversation
| sk_colors.reserve(count); | ||
| for (int i = 0; i < count; ++i) { | ||
| sk_colors.push_back(colors[i].argb()); | ||
| } | ||
| } | ||
| canvas_->drawAtlas(skia_atlas.get(), xform, ToSkRects(tex), sk_colors.data(), |
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.
| 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, |
There was a problem hiding this comment.
| 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) { |
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
|
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
|
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. |
Colors are optionally provided, so make sure to null check the array.
Fixes flutter/flutter#155783