Skip to content

Commit 9689e39

Browse files
lhkbobSkia Commit-Bot
authored andcommitted
Update complex clip GMs to only use supported clip ops
Bug: skia:10207 Change-Id: Ie87d78b12874fb87697fe22856b4a83b9f28dda8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/287818 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Michael Ludwig <michaelludwig@google.com>
1 parent 5d164a2 commit 9689e39

File tree

6 files changed

+5
-26
lines changed

6 files changed

+5
-26
lines changed

gm/circularclips.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,13 @@ class CircularClipsGM : public skiagm::GM {
4040
}
4141

4242
SkISize onISize() override {
43-
return SkISize::Make(800, 600);
43+
return SkISize::Make(800, 200);
4444
}
4545

4646
void onDraw(SkCanvas* canvas) override {
4747
const SkClipOp ops[] = {
4848
kDifference_SkClipOp,
49-
kIntersect_SkClipOp,
50-
kUnion_SkClipOp,
51-
kXOR_SkClipOp,
52-
kReverseDifference_SkClipOp,
53-
kReplace_SkClipOp,
49+
kIntersect_SkClipOp
5450
};
5551

5652
SkRect rect = SkRect::MakeLTRB(fX1 - fR, fY - fR, fX2 + fR, fY + fR);

gm/complexclip.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class ComplexClipGM : public GM {
5151
return str;
5252
}
5353

54-
SkISize onISize() override { return SkISize::Make(970, 780); }
54+
SkISize onISize() override { return SkISize::Make(388, 780); }
5555

5656
void onDraw(SkCanvas* canvas) override {
5757
SkPath path;
@@ -92,9 +92,6 @@ class ComplexClipGM : public GM {
9292
} gOps[] = { //extra spaces in names for measureText
9393
{kIntersect_SkClipOp, "Isect "},
9494
{kDifference_SkClipOp, "Diff " },
95-
{kUnion_SkClipOp, "Union "},
96-
{kXOR_SkClipOp, "Xor " },
97-
{kReverseDifference_SkClipOp, "RDiff "}
9895
};
9996

10097
canvas->translate(20, 20);

gm/complexclip2.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@ class ComplexClip2GM : public GM {
9393
const SkClipOp ops[] = {
9494
kDifference_SkClipOp,
9595
kIntersect_SkClipOp,
96-
kUnion_SkClipOp,
97-
kXOR_SkClipOp,
98-
kReverseDifference_SkClipOp,
99-
kReplace_SkClipOp,
10096
};
10197

10298
SkRandom r;

gm/complexclip3.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ComplexClip3GM : public GM {
4242
return str;
4343
}
4444

45-
SkISize onISize() { return SkISize::Make(1000, 950); }
45+
SkISize onISize() { return SkISize::Make(400, 950); }
4646

4747
virtual void onDraw(SkCanvas* canvas) {
4848
SkPath clipSimple;
@@ -73,9 +73,6 @@ class ComplexClip3GM : public GM {
7373
} gOps[] = {
7474
{kIntersect_SkClipOp, "I"},
7575
{kDifference_SkClipOp, "D" },
76-
{kUnion_SkClipOp, "U"},
77-
{kXOR_SkClipOp, "X" },
78-
{kReverseDifference_SkClipOp, "R"}
7976
};
8077

8178
canvas->translate(SkIntToScalar(20), SkIntToScalar(20));

gm/simpleaaclip.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class SimpleClipGM : public GM {
151151
}
152152

153153
SkISize onISize() override {
154-
return SkISize::Make(640, 480);
154+
return SkISize::Make(500, 240);
155155
}
156156

157157
void onDraw(SkCanvas* canvas) override {
@@ -163,10 +163,6 @@ class SimpleClipGM : public GM {
163163
} gOps[] = {
164164
{SK_ColorBLACK, "Difference", kDifference_SkClipOp},
165165
{SK_ColorRED, "Intersect", kIntersect_SkClipOp},
166-
{ToolUtils::color_to_565(0xFF008800), "Union", kUnion_SkClipOp},
167-
{SK_ColorGREEN, "Rev Diff", kReverseDifference_SkClipOp},
168-
{SK_ColorYELLOW, "Replace", kReplace_SkClipOp},
169-
{SK_ColorBLUE, "XOR", kXOR_SkClipOp},
170166
};
171167

172168
SkPaint textPaint;

samplecode/SampleComplexClip.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ class ComplexClipView : public Sample {
8080
} gOps[] = { //extra spaces in names for measureText
8181
{kIntersect_SkClipOp, "Isect "},
8282
{kDifference_SkClipOp, "Diff " },
83-
{kUnion_SkClipOp, "Union "},
84-
{kXOR_SkClipOp, "Xor " },
85-
{kReverseDifference_SkClipOp, "RDiff "}
8683
};
8784

8885
canvas->translate(0, SkIntToScalar(40));

0 commit comments

Comments
 (0)