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/complexclip3.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gm/complexclip3.cpp') diff --git a/gm/complexclip3.cpp b/gm/complexclip3.cpp index 1deb446145..fd8cd35100 100644 --- a/gm/complexclip3.cpp +++ b/gm/complexclip3.cpp @@ -52,14 +52,14 @@ protected: paint.setTextSize(SkIntToScalar(20)); constexpr struct { - SkRegion::Op fOp; - const char* fName; + SkCanvas::ClipOp fOp; + const char* fName; } gOps[] = { - {SkRegion::kIntersect_Op, "I"}, - {SkRegion::kDifference_Op, "D" }, - {SkRegion::kUnion_Op, "U"}, - {SkRegion::kXOR_Op, "X" }, - {SkRegion::kReverseDifference_Op, "R"} + {SkCanvas::kIntersect_Op, "I"}, + {SkCanvas::kDifference_Op, "D" }, + {SkCanvas::kUnion_Op, "U"}, + {SkCanvas::kXOR_Op, "X" }, + {SkCanvas::kReverseDifference_Op, "R"} }; canvas->translate(SkIntToScalar(20), SkIntToScalar(20)); @@ -84,7 +84,7 @@ protected: SkPath::kEvenOdd_FillType); secondClip->setFillType(doInvB ? SkPath::kInverseEvenOdd_FillType : SkPath::kEvenOdd_FillType); - canvas->clipPath(*firstClip, SkRegion::kIntersect_Op, doAAA); + canvas->clipPath(*firstClip, SkCanvas::kIntersect_Op, doAAA); canvas->clipPath(*secondClip, gOps[op].fOp, doAAB); // draw rect clipped -- cgit v1.2.3