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 --- bench/AAClipBench.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'bench/AAClipBench.cpp') diff --git a/bench/AAClipBench.cpp b/bench/AAClipBench.cpp index f3159b6168..f91216e965 100644 --- a/bench/AAClipBench.cpp +++ b/bench/AAClipBench.cpp @@ -59,9 +59,9 @@ protected: canvas->save(); #if 1 if (fDoPath) { - canvas->clipPath(fClipPath, kReplace_SkClipOp, fDoAA); + canvas->clipPath(fClipPath, SkCanvas::kReplace_Op, fDoAA); } else { - canvas->clipRect(fClipRect, kReplace_SkClipOp, fDoAA); + canvas->clipRect(fClipRect, SkCanvas::kReplace_Op, fDoAA); } canvas->drawRect(fDrawRect, paint); @@ -130,7 +130,8 @@ protected: SkASSERT(path.isConvex()); canvas->clipPath(path, - 0 == depth ? kReplace_SkClipOp : kIntersect_SkClipOp, + 0 == depth ? SkCanvas::kReplace_Op : + SkCanvas::kIntersect_Op, fDoAA); if (kNestingDepth == depth) { -- cgit v1.2.3