use ClipOp instead of SkRegion for clipping

src/utils/SkProxyCanvas.cpp

-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "SkProxyCanvas.h"
 
 SkProxyCanvas::SkProxyCanvas(SkCanvas* proxy) : fProxy(proxy) {
     SkSafeRef(fProxy);
 }
 
 SkProxyCanvas::~SkProxyCanvas() {
     SkSafeUnref(fProxy);
 }
 
@@ skipping 25 matching lines @@
     fProxy->concat(matrix);
     this->INHERITED::didConcat(matrix);
 }
 
 void SkProxyCanvas::didSetMatrix(const SkMatrix& matrix) {
     fProxy->setMatrix(matrix);
     this->INHERITED::didSetMatrix(matrix);
 }
 
 void SkProxyCanvas::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
-    fProxy->clipRect(rect, op, kSoft_ClipEdgeStyle == edgeStyle);
+    fProxy->legacyClipRect(rect, op, kSoft_ClipEdgeStyle == edgeStyle);
 }
 
 void SkProxyCanvas::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
-    fProxy->clipRRect(rrect, op, kSoft_ClipEdgeStyle == edgeStyle);
+    fProxy->legacyClipRRect(rrect, op, kSoft_ClipEdgeStyle == edgeStyle);
 }
 
 void SkProxyCanvas::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
-    fProxy->clipPath(path, op, kSoft_ClipEdgeStyle == edgeStyle);
+    fProxy->legacyClipPath(path, op, kSoft_ClipEdgeStyle == edgeStyle);
 }
 
 void SkProxyCanvas::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
-    fProxy->clipRegion(deviceRgn, op);
+    fProxy->legacyClipRegion(deviceRgn, op);
 }
 
 void SkProxyCanvas::drawPaint(const SkPaint& paint) {
     fProxy->drawPaint(paint);
 }
 
 void SkProxyCanvas::drawPoints(PointMode mode, size_t count,
                                const SkPoint pts[], const SkPaint& paint) {
     fProxy->drawPoints(mode, count, pts, paint);
 }
@@ skipping 108 matching lines @@
     fProxy->addComment(kywd, value);
 }
 
 void SkProxyCanvas::endCommentGroup() {
     fProxy->endCommentGroup();
 }
 
 SkDrawFilter* SkProxyCanvas::setDrawFilter(SkDrawFilter* filter) {
     return fProxy->setDrawFilter(filter);
 }