commit c1f7774e8d327e3c98b4094c9c01d26e27013f71
author Mike Reed <reed@google.com> Fri Dec 09 09:00:50 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 09 14:33:41 2016 +0000
tree 202eecd519054c880daa6995876abb5d42fdbc89
parent 374e04acfa00da3c20a29d391b3e7305e37fbcfb

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>

tools/android/SkAndroidSDKCanvas.cpp

diff --git a/tools/android/SkAndroidSDKCanvas.cpp b/tools/android/SkAndroidSDKCanvas.cpp
index 85a3e98..27a0235 100644
--- a/tools/android/SkAndroidSDKCanvas.cpp
+++ b/tools/android/SkAndroidSDKCanvas.cpp
@@ -341,25 +341,19 @@
     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);
 }