use ClipOp instead of SkRegion for clipping

src/utils/SkDeferredCanvas.cpp

Index: src/utils/SkDeferredCanvas.cpp
diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp
index 34b9146996edc4e6d0d9da8ba3bef52503042132..25efa6cadeee7202c679fc9ee67f124bb87372bd 100644
--- a/src/utils/SkDeferredCanvas.cpp
+++ b/src/utils/SkDeferredCanvas.cpp
@@ -712,7 +712,7 @@ void SkDeferredCanvas::didSetMatrix(const SkMatrix& matrix) {
 void SkDeferredCanvas::onClipRect(const SkRect& rect,
                                   SkRegion::Op op,
                                   ClipEdgeStyle edgeStyle) {
-    this->drawingCanvas()->clipRect(rect, op, kSoft_ClipEdgeStyle == edgeStyle);
+    this->drawingCanvas()->legacyClipRect(rect, op, kSoft_ClipEdgeStyle == edgeStyle);
     this->INHERITED::onClipRect(rect, op, edgeStyle);
     this->recordedDrawCommand();
 }
@@ -720,7 +720,7 @@ void SkDeferredCanvas::onClipRect(const SkRect& rect,
 void SkDeferredCanvas::onClipRRect(const SkRRect& rrect,
                                    SkRegion::Op op,
                                    ClipEdgeStyle edgeStyle) {
-    this->drawingCanvas()->clipRRect(rrect, op, kSoft_ClipEdgeStyle == edgeStyle);
+    this->drawingCanvas()->legacyClipRRect(rrect, op, kSoft_ClipEdgeStyle == edgeStyle);
     this->INHERITED::onClipRRect(rrect, op, edgeStyle);
     this->recordedDrawCommand();
 }
@@ -728,13 +728,13 @@ void SkDeferredCanvas::onClipRRect(const SkRRect& rrect,
 void SkDeferredCanvas::onClipPath(const SkPath& path,
                                   SkRegion::Op op,
                                   ClipEdgeStyle edgeStyle) {
-    this->drawingCanvas()->clipPath(path, op, kSoft_ClipEdgeStyle == edgeStyle);
+    this->drawingCanvas()->legacyClipPath(path, op, kSoft_ClipEdgeStyle == edgeStyle);
     this->INHERITED::onClipPath(path, op, edgeStyle);
     this->recordedDrawCommand();
 }
 
 void SkDeferredCanvas::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
-    this->drawingCanvas()->clipRegion(deviceRgn, op);
+    this->drawingCanvas()->legacyClipRegion(deviceRgn, op);
     this->INHERITED::onClipRegion(deviceRgn, op);
     this->recordedDrawCommand();
 }