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 /tests/CanvasTest.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 'tests/CanvasTest.cpp')
| -rw-r--r-- | tests/CanvasTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp index b209d0df34..59642975b4 100644 --- a/tests/CanvasTest.cpp +++ b/tests/CanvasTest.cpp @@ -173,13 +173,13 @@ class Canvas2CanvasClipVisitor : public SkCanvas::ClipVisitor { public: Canvas2CanvasClipVisitor(SkCanvas* target) : fTarget(target) {} - void clipRect(const SkRect& r, SkRegion::Op op, bool aa) override { + void clipRect(const SkRect& r, SkCanvas::ClipOp op, bool aa) override { fTarget->clipRect(r, op, aa); } - void clipRRect(const SkRRect& r, SkRegion::Op op, bool aa) override { + void clipRRect(const SkRRect& r, SkCanvas::ClipOp op, bool aa) override { fTarget->clipRRect(r, op, aa); } - void clipPath(const SkPath& p, SkRegion::Op op, bool aa) override { + void clipPath(const SkPath& p, SkCanvas::ClipOp op, bool aa) override { fTarget->clipPath(p, op, aa); } @@ -299,7 +299,7 @@ SIMPLE_TEST_STEP(Concat, concat(d.fMatrix)); SIMPLE_TEST_STEP(SetMatrix, setMatrix(d.fMatrix)); SIMPLE_TEST_STEP(ClipRect, clipRect(d.fRect)); SIMPLE_TEST_STEP(ClipPath, clipPath(d.fPath)); -SIMPLE_TEST_STEP(ClipRegion, clipRegion(d.fRegion, SkRegion::kReplace_Op)); +SIMPLE_TEST_STEP(ClipRegion, clipRegion(d.fRegion, SkCanvas::kReplace_Op)); SIMPLE_TEST_STEP(Clear, clear(d.fColor)); /////////////////////////////////////////////////////////////////////////////// |