use ClipOp instead of SkRegion for clipping

src/utils/SkDeferredCanvas.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDeferredCanvas.h"
 
@@ skipping 694 matching lines @@
 
 void SkDeferredCanvas::didSetMatrix(const SkMatrix& matrix) {
     this->drawingCanvas()->setMatrix(matrix);
     this->recordedDrawCommand();
     this->INHERITED::didSetMatrix(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();
 }
 
 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();
 }
 
 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();
 }
 
 void SkDeferredCanvas::drawPaint(const SkPaint& paint) {
     if (fDeferredDrawing && this->isFullFrame(NULL, &paint) &&
         isPaintOpaque(&paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
     AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
@@ skipping 184 matching lines @@
 SkDrawFilter* SkDeferredCanvas::setDrawFilter(SkDrawFilter* filter) {
     this->drawingCanvas()->setDrawFilter(filter);
     this->INHERITED::setDrawFilter(filter);
     this->recordedDrawCommand();
     return filter;
 }
 
 SkCanvas* SkDeferredCanvas::canvasForDrawIter() {
     return this->drawingCanvas();
 }