abstract name of clipping ops, to transtion to a more restricted set

src/utils/SkDeferredCanvas.cpp

 /*
  * Copyright 2016 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"
 #include "SkDrawable.h"
 #include "SkPath.h"
@@ skipping 81 matching lines @@
 
 void SkDeferredCanvas::emit(const Rec& rec) {
     switch (rec.fType) {
         case kSave_Type:
             fCanvas->save();
             this->INHERITED::willSave();
             break;
         case kClipRect_Type:
             fCanvas->clipRect(rec.fData.fBounds);
             this->INHERITED::onClipRect(rec.fData.fBounds,
-                                        SkRegion::kIntersect_Op, kHard_ClipEdgeStyle);
+                                        kIntersect_Op, kHard_ClipEdgeStyle);
             break;
         case kTrans_Type:
         case kScaleTrans_Type: {
             SkMatrix mat;
             rec.getConcat(&mat);
             fCanvas->concat(mat);
             this->INHERITED::didConcat(mat);
         } break;
     }
 }
@@ skipping 152 matching lines @@
         this->INHERITED::didConcat(matrix);
     }
 }
 
 void SkDeferredCanvas::didSetMatrix(const SkMatrix& matrix) {
     this->flush_all();
     fCanvas->setMatrix(matrix);
     this->INHERITED::didSetMatrix(matrix);
 }
 
-void SkDeferredCanvas::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
-    if (SkRegion::kIntersect_Op == op) {
+void SkDeferredCanvas::onClipRect(const SkRect& rect, ClipOp op, ClipEdgeStyle edgeStyle) {
+    if (kIntersect_Op == op) {
         this->push_cliprect(rect);
     } else {
         this->flush_all();
         fCanvas->clipRect(rect, op, kSoft_ClipEdgeStyle == edgeStyle);
         this->INHERITED::onClipRect(rect, op, edgeStyle);
     }
 }
 
-void SkDeferredCanvas::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
+void SkDeferredCanvas::onClipRRect(const SkRRect& rrect, ClipOp op, ClipEdgeStyle edgeStyle) {
     this->flush_all();
     fCanvas->clipRRect(rrect, op, kSoft_ClipEdgeStyle == edgeStyle);
     this->INHERITED::onClipRRect(rrect, op, edgeStyle);
 }
 
-void SkDeferredCanvas::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
+void SkDeferredCanvas::onClipPath(const SkPath& path, ClipOp op, ClipEdgeStyle edgeStyle) {
     this->flush_all();
     fCanvas->clipPath(path, op, kSoft_ClipEdgeStyle == edgeStyle);
     this->INHERITED::onClipPath(path, op, edgeStyle);
 }
 
-void SkDeferredCanvas::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
+void SkDeferredCanvas::onClipRegion(const SkRegion& deviceRgn, ClipOp op) {
     this->flush_all();
     fCanvas->clipRegion(deviceRgn, op);
     this->INHERITED::onClipRegion(deviceRgn, op);
 }
 
 void SkDeferredCanvas::onDrawPaint(const SkPaint& paint) {
     // TODO: Can we turn this into drawRect?
     this->flush_all();
     fCanvas->drawPaint(paint);
 }
@@ skipping 235 matching lines @@
         return true;
     }
     return false;
 }
 SkImageInfo SkDeferredCanvas::onImageInfo() const { return fCanvas->imageInfo(); }
 bool SkDeferredCanvas::onGetProps(SkSurfaceProps* props) const { return fCanvas->getProps(props); }
 void SkDeferredCanvas::onFlush() {
     this->flush_all();
     return fCanvas->flush();
 }