From 8e7432b7f98dd592e529a0c8bb038d73ebfb0478 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Thu, 8 Dec 2016 16:06:37 -0500 Subject: 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 --- gm/complexclip2.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gm/complexclip2.cpp') diff --git a/gm/complexclip2.cpp b/gm/complexclip2.cpp index 3180f6681a..71e07c9221 100644 --- a/gm/complexclip2.cpp +++ b/gm/complexclip2.cpp @@ -83,13 +83,13 @@ protected: fPaths[4].addRoundRect(fRects[4], 5, 5); fRectColors[4] = SK_ColorCYAN; - SkCanvas::ClipOp ops[] = { - SkCanvas::kDifference_Op, - SkCanvas::kIntersect_Op, - SkCanvas::kUnion_Op, - SkCanvas::kXOR_Op, - SkCanvas::kReverseDifference_Op, - SkCanvas::kReplace_Op, + const SkClipOp ops[] = { + kDifference_SkClipOp, + kIntersect_SkClipOp, + kUnion_SkClipOp, + kXOR_SkClipOp, + kReverseDifference_SkClipOp, + kReplace_SkClipOp, }; SkRandom r; @@ -200,7 +200,7 @@ private: SkRRect fRRects[5]; SkPath fPaths[5]; SkColor fRectColors[5]; - SkCanvas::ClipOp fOps[kRows * kCols][5]; + SkClipOp fOps[kRows * kCols][5]; SkScalar fWidth; SkScalar fHeight; SkScalar fTotalWidth; -- cgit v1.2.3