Skip to content

Commit 2994d94

Browse files
committed
[Impeller] Use a golden test for dilation outside a clip
Move the regression to the Aiks clip tests so Skia Gold compares the whole image, including the strip that dilates into the clip.
1 parent f4cc5c8 commit 2994d94

2 files changed

Lines changed: 18 additions & 26 deletions

File tree

‎engine/src/flutter/impeller/display_list/aiks_dl_clip_unittests.cc‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "flutter/display_list/dl_color.h"
1010
#include "flutter/display_list/dl_paint.h"
1111
#include "flutter/display_list/effects/dl_color_filter.h"
12+
#include "flutter/display_list/effects/dl_image_filter.h"
1213
#include "flutter/display_list/geometry/dl_path_builder.h"
1314
#include "flutter/testing/testing.h"
1415

@@ -139,5 +140,22 @@ TEST_P(AiksTest, FramebufferBlendsRespectClips) {
139140
ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
140141
}
141142

143+
TEST_P(AiksTest, DilatedContentOutsideClip) {
144+
SetWindowSize(impeller::ISize(160, 100));
145+
DisplayListBuilder builder;
146+
builder.DrawColor(DlColor::kBlack(), DlBlendMode::kSrc);
147+
builder.ClipRect(DlRect::MakeXYWH(20, 20, 100, 60));
148+
149+
DlPaint layer_paint;
150+
layer_paint.setImageFilter(DlImageFilter::MakeDilate(10, 10));
151+
builder.SaveLayer(DlRect::MakeXYWH(0, 0, 160, 100), &layer_paint);
152+
// The rectangle is outside the clip, but its dilated right edge is inside.
153+
builder.DrawRect(DlRect::MakeXYWH(15, 45, 4, 10),
154+
DlPaint().setColor(DlColor::kWhite()));
155+
builder.Restore();
156+
157+
ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
158+
}
159+
142160
} // namespace testing
143161
} // namespace impeller

‎engine/src/flutter/impeller/display_list/dl_golden_unittests.cc‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -140,32 +140,6 @@ TEST_P(DlGoldenTest, FractionalDilation) {
140140
ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
141141
}
142142

143-
TEST_P(DlGoldenTest, DilatedContentOutsideClip) {
144-
SetWindowSize(impeller::ISize(160, 100));
145-
DisplayListBuilder builder;
146-
builder.DrawColor(DlColor::kBlack(), DlBlendMode::kSrc);
147-
builder.ClipRect(DlRect::MakeXYWH(20, 20, 100, 60));
148-
149-
DlPaint layer_paint;
150-
layer_paint.setImageFilter(DlImageFilter::MakeDilate(10, 10));
151-
builder.SaveLayer(DlRect::MakeXYWH(0, 0, 160, 100), &layer_paint);
152-
// The rectangle is outside the clip, but its dilated right edge is inside.
153-
builder.DrawRect(DlRect::MakeXYWH(15, 45, 4, 10),
154-
DlPaint().setColor(DlColor::kWhite()));
155-
builder.Restore();
156-
157-
auto screenshot = MakeScreenshot(builder.Build());
158-
if (!screenshot) {
159-
GTEST_SKIP() << "making screenshots not supported.";
160-
}
161-
const uint8_t* row =
162-
screenshot->GetBytes() + 50 * screenshot->GetBytesPerRow();
163-
for (size_t channel = 0; channel < 3; channel++) {
164-
EXPECT_EQ(row[24 * 4 + channel], 255);
165-
EXPECT_EQ(row[15 * 4 + channel], 0);
166-
}
167-
}
168-
169143
namespace {
170144
void DrawBlurGrid(DlCanvas* canvas) {
171145
DlPaint paint;

0 commit comments

Comments
 (0)