diff options
| author |  Mike Reed <reed@google.com> | 2016-12-09 09:00:50 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-09 14:33:41 +0000 |
| commit | c1f7774e8d327e3c98b4094c9c01d26e27013f71 (patch) | |
| tree | 202eecd519054c880daa6995876abb5d42fdbc89 /tests/CanvasTest.cpp | |
| parent | 374e04acfa00da3c20a29d391b3e7305e37fbcfb (diff) | |
Revert[2] "remove SK_SUPPORT_LEGACY_CLIP_REGIONOPS"
This reverts commit a129dfef2aaab0b5995cdf1ab7b2cdd41c29cf72.
BUG=skia:
Change-Id: I717de6e5fcd4516aa684b014b1414b0f82ac2b91
Reviewed-on: https://skia-review.googlesource.com/5722
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
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 f460ab6e3b..bb34cb657c 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, SkCanvas::ClipOp op, bool aa) override { + void clipRect(const SkRect& r, SkClipOp op, bool aa) override { fTarget->clipRect(r, op, aa); } - void clipRRect(const SkRRect& r, SkCanvas::ClipOp op, bool aa) override { + void clipRRect(const SkRRect& r, SkClipOp op, bool aa) override { fTarget->clipRRect(r, op, aa); } - void clipPath(const SkPath& p, SkCanvas::ClipOp op, bool aa) override { + void clipPath(const SkPath& p, SkClipOp 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, SkCanvas::kReplace_Op)); +SIMPLE_TEST_STEP(ClipRegion, clipRegion(d.fRegion, kReplace_SkClipOp)); SIMPLE_TEST_STEP(Clear, clear(d.fColor)); /////////////////////////////////////////////////////////////////////////////// |