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

Fix null filter NOP case in DlLocalMatrixImageFilter #51340

Merged
merged 2 commits into from
Mar 12, 2024
Merged

Fix null filter NOP case in DlLocalMatrixImageFilter #51340

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
46c725d
Fix null filter NOP case in DlLocalMatrixImageFilter
flar Mar 11, 2024
eec4c73
another test on NOP results
flar Mar 11, 2024
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
9 changes: 6 additions & 3 deletions display_list/effects/dl_image_filter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,8 @@ class DlLocalMatrixImageFilter final : public DlImageFilter {
SkRect* map_local_bounds(const SkRect& input_bounds,
SkRect& output_bounds) const override {
if (!image_filter_) {
return nullptr;
output_bounds = input_bounds;
return &output_bounds;
}
return image_filter_->map_local_bounds(input_bounds, output_bounds);
}
Expand All @@ -709,7 +710,8 @@ class DlLocalMatrixImageFilter final : public DlImageFilter {
const SkMatrix& ctm,
SkIRect& output_bounds) const override {
if (!image_filter_) {
return nullptr;
output_bounds = input_bounds;
return &output_bounds;
}
return image_filter_->map_device_bounds(
input_bounds, SkMatrix::Concat(ctm, matrix_), output_bounds);
Expand All @@ -719,7 +721,8 @@ class DlLocalMatrixImageFilter final : public DlImageFilter {
const SkMatrix& ctm,
SkIRect& input_bounds) const override {
if (!image_filter_) {
return nullptr;
input_bounds = output_bounds;
return &input_bounds;
}
return image_filter_->get_input_device_bounds(
output_bounds, SkMatrix::Concat(ctm, matrix_), input_bounds);
Expand Down
30 changes: 30 additions & 0 deletions display_list/effects/dl_image_filter_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,6 +734,36 @@ TEST(DisplayListImageFilter, LocalImageFilterBounds) {
std::vector<SkMatrix> bounds_matrices{SkMatrix::Translate(5.0, 10.0),
SkMatrix::Scale(2.0, 2.0)};

for (unsigned j = 0; j < matrices.size(); j++) {
DlLocalMatrixImageFilter filter(matrices[j], nullptr);
{
const auto input_bounds = SkRect::MakeLTRB(20, 20, 80, 80);
SkRect output_bounds;
EXPECT_EQ(filter.map_local_bounds(input_bounds, output_bounds),
&output_bounds);
EXPECT_EQ(input_bounds, output_bounds);
}
for (unsigned k = 0; k < bounds_matrices.size(); k++) {
auto& bounds_matrix = bounds_matrices[k];
{
const auto input_bounds = SkIRect::MakeLTRB(20, 20, 80, 80);
SkIRect output_bounds;
EXPECT_EQ(filter.map_device_bounds(input_bounds, bounds_matrix,
output_bounds),
&output_bounds);
EXPECT_EQ(input_bounds, output_bounds);
}
{
const auto output_bounds = SkIRect::MakeLTRB(20, 20, 80, 80);
SkIRect input_bounds;
EXPECT_EQ(filter.get_input_device_bounds(output_bounds, bounds_matrix,
input_bounds),
&input_bounds);
EXPECT_EQ(input_bounds, output_bounds);
}
}
}

for (unsigned i = 0; i < sk_filters.size(); i++) {
for (unsigned j = 0; j < matrices.size(); j++) {
for (unsigned k = 0; k < bounds_matrices.size(); k++) {
Expand Down