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 --- samplecode/SampleComplexClip.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'samplecode/SampleComplexClip.cpp') diff --git a/samplecode/SampleComplexClip.cpp b/samplecode/SampleComplexClip.cpp index ae8a20f6a5..7439d91f7f 100644 --- a/samplecode/SampleComplexClip.cpp +++ b/samplecode/SampleComplexClip.cpp @@ -79,14 +79,14 @@ protected: canvas->drawPath(clipB, paint); static const struct { - SkClipOp fOp; - const char* fName; + SkCanvas::ClipOp fOp; + const char* fName; } gOps[] = { //extra spaces in names for measureText - {kIntersect_SkClipOp, "Isect "}, - {kDifference_SkClipOp, "Diff " }, - {kUnion_SkClipOp, "Union "}, - {kXOR_SkClipOp, "Xor " }, - {kReverseDifference_SkClipOp, "RDiff "} + {SkCanvas::kIntersect_Op, "Isect "}, + {SkCanvas::kDifference_Op, "Diff " }, + {SkCanvas::kUnion_Op, "Union "}, + {SkCanvas::kXOR_Op, "Xor " }, + {SkCanvas::kReverseDifference_Op, "RDiff "} }; canvas->translate(0, SkIntToScalar(40)); -- cgit v1.2.3