aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/SampleComplexClip.cpp
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2016-09-20 08:42:38 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-09-20 08:42:39 -0700
commit73603f3c52ffd89fe9d035be827b566a0e7d3b79 (patch)
tree873793b81536379196233f313b1a093d02bdac0e /samplecode/SampleComplexClip.cpp
parentcae1be5acc8148fc5cbadd8730ee7994e50a1a47 (diff)
abstract name of clipping ops, to transtion to a more restricted set
SkRegion::Op --> SkCanvas::ClipOp (alias) --> SkClipOp pre-CL needed in chrome : https://codereview.chromium.org/2355583002/ BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2355483002 Review-Url: https://codereview.chromium.org/2355483002
Diffstat (limited to 'samplecode/SampleComplexClip.cpp')
-rw-r--r--samplecode/SampleComplexClip.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/samplecode/SampleComplexClip.cpp b/samplecode/SampleComplexClip.cpp
index aab759c65a..7439d91f7f 100644
--- a/samplecode/SampleComplexClip.cpp
+++ b/samplecode/SampleComplexClip.cpp
@@ -79,14 +79,14 @@ protected:
canvas->drawPath(clipB, paint);
static const struct {
- SkRegion::Op fOp;
- const char* fName;
+ SkCanvas::ClipOp fOp;
+ const char* fName;
} gOps[] = { //extra spaces in names for measureText
- {SkRegion::kIntersect_Op, "Isect "},
- {SkRegion::kDifference_Op, "Diff " },
- {SkRegion::kUnion_Op, "Union "},
- {SkRegion::kXOR_Op, "Xor " },
- {SkRegion::kReverseDifference_Op, "RDiff "}
+ {SkCanvas::kIntersect_Op, "Isect "},
+ {SkCanvas::kDifference_Op, "Diff " },
+ {SkCanvas::kUnion_Op, "Union "},
+ {SkCanvas::kXOR_Op, "Xor " },
+ {SkCanvas::kReverseDifference_Op, "RDiff "}
};
canvas->translate(0, SkIntToScalar(40));