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>

2 files changed, 8 insertions, 14 deletions

diff --git a/tools/android/SkAndroidSDKCanvas.cpp b/tools/android/SkAndroidSDKCanvas.cpp
index 85a3e989ce..27a0235eda 100644
--- a/tools/android/SkAndroidSDKCanvas.cpp
+++ b/tools/android/SkAndroidSDKCanvas.cpp
@@ -341,25 +341,19 @@ void SkAndroidSDKCanvas::didSetMatrix(const SkMatrix& m) {
     fProxyTarget->setMatrix(m);
 }
 
-void SkAndroidSDKCanvas::onClipRect(const SkRect& rect,
-                                             ClipOp op,
-                                             ClipEdgeStyle style) {
+void SkAndroidSDKCanvas::onClipRect(const SkRect& rect, SkClipOp op, ClipEdgeStyle style) {
     fProxyTarget->clipRect(rect, op, style);
 }
 
-void SkAndroidSDKCanvas::onClipRRect(const SkRRect& rrect,
-                                              ClipOp op,
-                                              ClipEdgeStyle style) {
+void SkAndroidSDKCanvas::onClipRRect(const SkRRect& rrect, SkClipOp op, ClipEdgeStyle style) {
     fProxyTarget->clipRRect(rrect, op, style);
 }
 
-void SkAndroidSDKCanvas::onClipPath(const SkPath& path,
-                                             ClipOp op,
-                                             ClipEdgeStyle style) {
+void SkAndroidSDKCanvas::onClipPath(const SkPath& path, SkClipOp op, ClipEdgeStyle style) {
     fProxyTarget->clipPath(path, op, style);
 }
 
-void SkAndroidSDKCanvas::onClipRegion(const SkRegion& region, ClipOp op) {
+void SkAndroidSDKCanvas::onClipRegion(const SkRegion& region, SkClipOp op) {
     fProxyTarget->clipRegion(region, op);
 }
 
diff --git a/tools/android/SkAndroidSDKCanvas.h b/tools/android/SkAndroidSDKCanvas.h
index ca92ea4067..97d9cdb78d 100644
--- a/tools/android/SkAndroidSDKCanvas.h
+++ b/tools/android/SkAndroidSDKCanvas.h
@@ -100,10 +100,10 @@ protected:
     void didRestore() override;
     void didConcat(const SkMatrix&) override;
     void didSetMatrix(const SkMatrix&) override;
-    void onClipRect(const SkRect&, ClipOp, ClipEdgeStyle) override;
-    void onClipRRect(const SkRRect&, ClipOp, ClipEdgeStyle) override;
-    void onClipPath(const SkPath&, ClipOp, ClipEdgeStyle) override;
-    void onClipRegion(const SkRegion&, ClipOp) override;
+    void onClipRect(const SkRect&, SkClipOp, ClipEdgeStyle) override;
+    void onClipRRect(const SkRRect&, SkClipOp, ClipEdgeStyle) override;
+    void onClipPath(const SkPath&, SkClipOp, ClipEdgeStyle) override;
+    void onClipRegion(const SkRegion&, SkClipOp) override;
     void onDiscard() override;
 
 protected: