From a129dfef2aaab0b5995cdf1ab7b2cdd41c29cf72 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 9 Dec 2016 13:14:25 +0000 Subject: Revert "remove SK_SUPPORT_LEGACY_CLIP_REGIONOPS" This reverts commit 8e7432b7f98dd592e529a0c8bb038d73ebfb0478. Reason for revert: external/skia/bench/../tools/android/SkAndroidSDKCanvas.h:103:36: error: C++ requires a type specifier for all declarations void onClipRect(const SkRect&, ClipOp, ClipEdgeStyle) override; Original change's description: > remove SK_SUPPORT_LEGACY_CLIP_REGIONOPS > > > switch over to SkClipOps now that SK_SUPPORT_LEGACY_CLIP_REGIONOPS is gone > > BUG=skia: > > Change-Id: Ifdc8b3746d508348a40cc009a4e529a1cb3c405d > Reviewed-on: https://skia-review.googlesource.com/5714 > Commit-Queue: Mike Reed > Reviewed-by: Mike Reed > TBR=reed@google.com,reviews@skia.org BUG=skia: NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: If26ea91d7464615e43c1d3d2f726e337ff56b55c Reviewed-on: https://skia-review.googlesource.com/5721 Commit-Queue: Mike Reed Reviewed-by: Mike Reed --- tests/CanvasTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/CanvasTest.cpp') diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp index bb34cb657c..f460ab6e3b 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, SkClipOp 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, SkClipOp 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, SkClipOp 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, kReplace_SkClipOp)); +SIMPLE_TEST_STEP(ClipRegion, clipRegion(d.fRegion, SkCanvas::kReplace_Op)); SIMPLE_TEST_STEP(Clear, clear(d.fColor)); /////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3