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/ClipBoundsTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/ClipBoundsTest.cpp') diff --git a/tests/ClipBoundsTest.cpp b/tests/ClipBoundsTest.cpp index e8aae38994..fd3e191ee6 100644 --- a/tests/ClipBoundsTest.cpp +++ b/tests/ClipBoundsTest.cpp @@ -26,7 +26,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrClipBounds, reporter, ctxInfo) { // create a clip stack that will (trivially) reduce to a single rect that // is larger than the screen SkClipStack stack; - stack.clipRect(clipRect, SkMatrix::I(), kReplace_SkClipOp, false); + stack.clipRect(clipRect, SkMatrix::I(), SkCanvas::kReplace_Op, false); bool isIntersectionOfRects = true; SkRect devStackBounds; -- cgit v1.2.3