From 73603f3c52ffd89fe9d035be827b566a0e7d3b79 Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 20 Sep 2016 08:42:38 -0700 Subject: 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 --- gm/complexclip.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gm/complexclip.cpp') 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 -- cgit v1.2.3