use ClipOp instead of SkRegion for clipping

src/core/SkCanvas.cpp

 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkCanvasDrawable.h"
 #include "SkCanvasPriv.h"
@@ skipping 1317 matching lines @@
 
 void SkCanvas::resetMatrix() {
     SkMatrix matrix;
 
     matrix.reset();
     this->setMatrix(matrix);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
+static SkRegion::Op clip2rgn(SkClipOp op) {
+    if (kIntersect_SkClipOp == op) {
+        return SkRegion::kIntersect_Op;
+    } else {
+        SkASSERT(kDifference_SkClipOp == op);
+        return SkRegion::kDifference_Op;
+    }
+}
+
+void SkCanvas::clipRect(const SkRect& rect, SkClipOp op, bool doAntiAlias) {
+    this->clipRect(rect, clip2rgn(op), doAntiAlias);
+}
+
+void SkCanvas::clipRRect(const SkRRect& rrect, SkClipOp op, bool doAntiAlias) {
+    this->clipRRect(rrect, clip2rgn(op), doAntiAlias);
+}
+
+void SkCanvas::clipPath(const SkPath& path, SkClipOp op, bool doAntiAlias) {
+    this->clipPath(path, clip2rgn(op), doAntiAlias);
+}
+
+void SkCanvas::clipRegion(const SkRegion& deviceRgn, SkClipOp op) {
+    this->clipRegion(deviceRgn, clip2rgn(op));
+}
+
 void SkCanvas::clipRect(const SkRect& rect, SkRegion::Op op, bool doAA) {
     ClipEdgeStyle edgeStyle = doAA ? kSoft_ClipEdgeStyle : kHard_ClipEdgeStyle;
     this->onClipRect(rect, op, edgeStyle);
 }
 
 void SkCanvas::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
 #ifdef SK_ENABLE_CLIP_QUICKREJECT
     if (SkRegion::kIntersect_Op == op) {
         if (fMCRec->fRasterClip.isEmpty()) {
             return false;
@@ skipping 1228 matching lines @@
     }
 
     if (matrix) {
         canvas->concat(*matrix);
     }
 }
 
 SkAutoCanvasMatrixPaint::~SkAutoCanvasMatrixPaint() {
     fCanvas->restoreToCount(fSaveCount);
 }