diff options
| author |  reed <reed@google.com> | 2016-09-20 08:42:38 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-20 08:42:39 -0700 |
| commit | 73603f3c52ffd89fe9d035be827b566a0e7d3b79 (patch) | |
| tree | 873793b81536379196233f313b1a093d02bdac0e /gm/complexclip.cpp | |
| parent | cae1be5acc8148fc5cbadd8730ee7994e50a1a47 (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 'gm/complexclip.cpp')
| -rw-r--r-- | gm/complexclip.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gm/complexclip.cpp b/gm/complexclip.cpp index ec22204453..fb94957f02 100644 --- a/gm/complexclip.cpp +++ b/gm/complexclip.cpp @@ -86,14 +86,14 @@ protected: paint.setTextSize(SkIntToScalar(20)); constexpr 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(SkIntToScalar(20), SkIntToScalar(20)); @@ -130,7 +130,7 @@ protected: SkPath::kEvenOdd_FillType); clipB.setFillType(doInvB ? SkPath::kInverseEvenOdd_FillType : SkPath::kEvenOdd_FillType); - canvas->clipPath(clipA, SkRegion::kIntersect_Op, fDoAAClip); + canvas->clipPath(clipA, SkCanvas::kIntersect_Op, fDoAAClip); canvas->clipPath(clipB, gOps[op].fOp, fDoAAClip); // In the inverse case we need to prevent the draw from covering the whole |