diff options
| author |  Mike Reed <reed@google.com> | 2016-12-09 09:00:50 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-09 14:33:41 +0000 |
| commit | c1f7774e8d327e3c98b4094c9c01d26e27013f71 (patch) | |
| tree | 202eecd519054c880daa6995876abb5d42fdbc89 /samplecode/SampleComplexClip.cpp | |
| parent | 374e04acfa00da3c20a29d391b3e7305e37fbcfb (diff) | |
Revert[2] "remove SK_SUPPORT_LEGACY_CLIP_REGIONOPS"
This reverts commit a129dfef2aaab0b5995cdf1ab7b2cdd41c29cf72.
BUG=skia:
Change-Id: I717de6e5fcd4516aa684b014b1414b0f82ac2b91
Reviewed-on: https://skia-review.googlesource.com/5722
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Diffstat (limited to 'samplecode/SampleComplexClip.cpp')
| -rw-r--r-- | samplecode/SampleComplexClip.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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)); |