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