Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions lib/ui/painting/image_filter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,14 @@ void ImageFilter::initColorFilter(ColorFilter* colorFilter) {

void ImageFilter::initComposeFilter(ImageFilter* outer, ImageFilter* inner) {
FML_DCHECK(outer && inner);
filter_ = std::make_shared<DlComposeImageFilter>(outer->dl_filter(),
inner->dl_filter());
if (!outer->dl_filter()) {
filter_ = inner->filter();
} else if (!inner->dl_filter()) {
filter_ = outer->filter();
} else {
filter_ = std::make_shared<DlComposeImageFilter>(outer->dl_filter(),
inner->dl_filter());
}
}

} // namespace flutter
5 changes: 5 additions & 0 deletions testing/dart/canvas_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@ void testNoCrashes() {

// Regression test for https://github.com/flutter/flutter/issues/115143
testCanvas((Canvas canvas) => canvas.drawPaint(Paint()..imageFilter = const ColorFilter.mode(Color(0x00000000), BlendMode.xor)));

// Regression test for https://github.com/flutter/flutter/issues/120278
testCanvas((Canvas canvas) => canvas.drawPaint(Paint()..imageFilter = ImageFilter.compose(
outer: ImageFilter.matrix(Matrix4.identity().storage),
inner: ImageFilter.blur())));
});
}

Expand Down