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 /src/utils/SkCanvasStateUtils.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 'src/utils/SkCanvasStateUtils.cpp')
-rw-r--r-- | src/utils/SkCanvasStateUtils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/utils/SkCanvasStateUtils.cpp b/src/utils/SkCanvasStateUtils.cpp index 4ef5e2f731..cc8ea43d43 100644 --- a/src/utils/SkCanvasStateUtils.cpp +++ b/src/utils/SkCanvasStateUtils.cpp @@ -142,15 +142,15 @@ public: bool failed() { return fFailed; } // ClipVisitor - void clipRect(const SkRect& rect, SkRegion::Op op, bool antialias) override { + void clipRect(const SkRect& rect, SkCanvas::ClipOp op, bool antialias) override { fFailed |= antialias; } - void clipRRect(const SkRRect& rrect, SkRegion::Op op, bool antialias) override { + void clipRRect(const SkRRect& rrect, SkCanvas::ClipOp op, bool antialias) override { fFailed |= antialias; } - void clipPath(const SkPath&, SkRegion::Op, bool antialias) override { + void clipPath(const SkPath&, SkCanvas::ClipOp, bool antialias) override { fFailed |= antialias; } @@ -284,7 +284,7 @@ static void setup_canvas_from_MC_state(const SkMCState& state, SkCanvas* canvas) } canvas->setMatrix(matrix); - canvas->setClipRegion(clip); + canvas->clipRegion(clip, SkCanvas::kReplace_Op); } static SkCanvas* create_canvas_from_canvas_layer(const SkCanvasLayerState& layerState) { |