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>
diff --git a/samplecode/SampleComplexClip.cpp b/samplecode/SampleComplexClip.cpp
index 7439d91..ae8a20f 100644
--- a/samplecode/SampleComplexClip.cpp
+++ b/samplecode/SampleComplexClip.cpp
@@ -79,14 +79,14 @@
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));