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
6 changes: 5 additions & 1 deletion display_list/display_list_image_filter.h
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,11 @@ class DlLocalMatrixImageFilter final : public DlImageFilter {
if (!image_filter_) {
return nullptr;
}
return image_filter_->skia_object()->makeWithLocalMatrix(matrix_);
sk_sp<SkImageFilter> skia_object = image_filter_->skia_object();
if (!skia_object) {
return nullptr;
}
return skia_object->makeWithLocalMatrix(matrix_);
}

protected:
Expand Down
10 changes: 10 additions & 0 deletions display_list/display_list_image_filter_unittests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,16 @@ TEST(DisplayListImageFilter, LocalImageFilterBounds) {
}
}

TEST(DisplayListImageFilter, LocalImageSkiaNull) {
auto blur_filter =
std::make_shared<DlBlurImageFilter>(0, 0, DlTileMode::kClamp);
DlLocalMatrixImageFilter dl_local_matrix_filter(SkMatrix::RotateDeg(45),
blur_filter);
// With sigmas set to zero on the blur filter, Skia will return a null filter.
// The local matrix filter should return nullptr instead of crashing.
ASSERT_EQ(dl_local_matrix_filter.skia_object(), nullptr);
}

TEST(DisplayListImageFilter, UnknownEquals) {
sk_sp<SkImageFilter> sk_filter =
SkImageFilters::Blur(5.0, 6.0, SkTileMode::kRepeat, nullptr);
Expand Down