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

gm/convexpolyclip.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 
 #include "SkBitmap.h"
@@ skipping 155 matching lines @@
                     if (doLayer) {
                         SkRect bounds;
                         clip->getBounds(&bounds);
                         bounds.outset(2, 2);
                         bounds.offset(x, y);
                         canvas->saveLayer(&bounds, nullptr);
                     } else {
                         canvas->save();
                     }
                     canvas->translate(x, y);
-                    clip->setOnCanvas(canvas, SkRegion::kIntersect_Op, SkToBool(aa));
+                    clip->setOnCanvas(canvas, SkCanvas::kIntersect_Op, SkToBool(aa));
                     canvas->drawBitmap(fBmp, 0, 0);
                     canvas->restore();
                     x += fBmp.width() + kMargin;
                 }
                 for (int aa = 0; aa < 2; ++aa) {
 
                     SkPaint clipOutlinePaint;
                     clipOutlinePaint.setAntiAlias(true);
                     clipOutlinePaint.setColor(0x50505050);
                     clipOutlinePaint.setStyle(SkPaint::kStroke_Style);
                     clipOutlinePaint.setStrokeWidth(0);
 
                     if (doLayer) {
                         SkRect bounds;
                         clip->getBounds(&bounds);
                         bounds.outset(2, 2);
                         bounds.offset(x, y);
                         canvas->saveLayer(&bounds, nullptr);
                     } else {
                         canvas->save();
                     }
                     canvas->translate(x, y);
                     SkPath closedClipPath;
                     clip->asClosedPath(&closedClipPath);
                     canvas->drawPath(closedClipPath, clipOutlinePaint);
-                    clip->setOnCanvas(canvas, SkRegion::kIntersect_Op, SkToBool(aa));
+                    clip->setOnCanvas(canvas, SkCanvas::kIntersect_Op, SkToBool(aa));
                     canvas->scale(1.f, 1.8f);
                     canvas->drawText(kTxt, SK_ARRAY_COUNT(kTxt)-1,
                                      0, 1.5f * txtPaint.getTextSize(),
                                      txtPaint);
                     canvas->restore();
                     x += textW + 2 * kMargin;
                 }
                 y += fBmp.height() + kMargin;
             }
             y = 0;
             startX += 2 * fBmp.width() + SkScalarCeilToInt(2 * textW) + 6 * kMargin;
         }
     }
 
     bool runAsBench() const override { return true; }
 
 private:
     class Clip {
     public:
         enum ClipType {
             kNone_ClipType,
             kPath_ClipType,
             kRect_ClipType
         };
 
         Clip () : fClipType(kNone_ClipType) {}
 
-        void setOnCanvas(SkCanvas* canvas, SkRegion::Op op, bool aa) const {
+        void setOnCanvas(SkCanvas* canvas, SkCanvas::ClipOp op, bool aa) const {
             switch (fClipType) {
                 case kPath_ClipType:
                     canvas->clipPath(fPath, op, aa);
                     break;
                 case kRect_ClipType:
                     canvas->clipRect(fRect, op, aa);
                     break;
                 case kNone_ClipType:
                     SkDEBUGFAIL("Uninitialized Clip.");
                     break;
@@ skipping 51 matching lines @@
 
     typedef SkTLList<Clip, 1> ClipList;
     ClipList         fClips;
     SkBitmap         fBmp;
 
     typedef GM INHERITED;
 };
 
 DEF_GM(return new ConvexPolyClip;)
 }