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 --- gm/circularclips.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gm/circularclips.cpp') diff --git a/gm/circularclips.cpp b/gm/circularclips.cpp index 9374f6fb91..f505310e4d 100644 --- a/gm/circularclips.cpp +++ b/gm/circularclips.cpp @@ -36,13 +36,13 @@ protected: } void onDraw(SkCanvas* canvas) override { - const SkClipOp ops[] = { - kDifference_SkClipOp, - kIntersect_SkClipOp, - kUnion_SkClipOp, - kXOR_SkClipOp, - kReverseDifference_SkClipOp, - kReplace_SkClipOp, + SkCanvas::ClipOp ops[] = { + SkCanvas::kDifference_Op, + SkCanvas::kIntersect_Op, + SkCanvas::kUnion_Op, + SkCanvas::kXOR_Op, + SkCanvas::kReverseDifference_Op, + SkCanvas::kReplace_Op, }; SkRect rect = SkRect::MakeLTRB(fX1 - fR, fY - fR, fX2 + fR, fY + fR); -- cgit v1.2.3