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

gm/megalooper.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 "gm.h"
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
@@ skipping 73 matching lines @@
         SkRect innerClip = { -kHalfSquareSize, -kHalfSquareSize, kHalfSquareSize, kHalfSquareSize };
         innerClip.offset(x, y);
 
         SkRect outerClip = {
             -kHalfOuterClipSize-kHalfSquareSize, -kHalfOuterClipSize-kHalfSquareSize,
              kHalfOuterClipSize+kHalfSquareSize,  kHalfOuterClipSize+kHalfSquareSize
         };
         outerClip.offset(x, y);
 
         canvas->save();
-        canvas->clipRect(outerClip, SkRegion::kIntersect_Op);
-        canvas->clipRect(innerClip, SkRegion::kDifference_Op);
+        canvas->clipRect(outerClip, SkCanvas::kIntersect_Op);
+        canvas->clipRect(innerClip, SkCanvas::kDifference_Op);
 
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setMaskFilter(MakeBlur());
 
         for (int i = 0; i < 4; ++i) {
             paint.setColor(gColors[i]);
 
             SkRect rect = { -kHalfSquareSize, -kHalfSquareSize, kHalfSquareSize, kHalfSquareSize };
             rect.offset(gBlurOffsets[i]);
@@ skipping 33 matching lines @@
                 kHalfOuterClipSize, kHalfOuterClipSize
             };
             outerClip.offset(x, y);
             // center it on the blurred rect
             outerClip.offset(gBlurOffsets[i]);
 
             SkRect rect = { -kHalfSquareSize, -kHalfSquareSize, kHalfSquareSize, kHalfSquareSize };
             rect.offset(x, y);
 
             canvas->save();
-                canvas->clipRect(outerClip, SkRegion::kIntersect_Op);
-                canvas->clipRect(rect, SkRegion::kDifference_Op);
+                canvas->clipRect(outerClip, SkCanvas::kIntersect_Op);
+                canvas->clipRect(rect, SkCanvas::kDifference_Op);
 
                 // move the rect to where we want the blur to appear
                 rect.offset(gBlurOffsets[i]);
                 // then move it outside the clip (the blur stage of the draw
                 // looper will undo this translation)
                 rect.offset(SkIntToScalar(kOffsetToOutsideClip), 0);
 
                 canvas->drawRect(rect, loopPaint);
             canvas->restore();
         }
@@ skipping 27 matching lines @@
             -kHalfOuterClipSize-kHalfSquareSize, -kHalfOuterClipSize-kHalfSquareSize,
              kHalfOuterClipSize+kHalfSquareSize,  kHalfOuterClipSize+kHalfSquareSize
         };
         outerClip.offset(x, y);
 
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setLooper(create4Looper(-kOffsetToOutsideClip-kHalfSquareSize, 0));
 
         canvas->save();
-            canvas->clipRect(outerClip, SkRegion::kIntersect_Op);
-            canvas->clipRect(rect, SkRegion::kDifference_Op);
+            canvas->clipRect(outerClip, SkCanvas::kIntersect_Op);
+            canvas->clipRect(rect, SkCanvas::kDifference_Op);
 
             rect.offset(SkIntToScalar(kOffsetToOutsideClip+kHalfSquareSize), 0);
             canvas->drawRect(rect, paint);
         canvas->restore();
     }
 
     // Create a 4-tier draw looper
     sk_sp<SkDrawLooper> create4Looper(SkScalar xOff, SkScalar yOff) {
         SkLayerDrawLooper::Builder looperBuilder;
         SkLayerDrawLooper::LayerInfo info;
@@ skipping 28 matching lines @@
     { -kHalfSquareSize, -kHalfSquareSize }
 };
 
 const SkColor MegaLooperGM::gColors[4] = {
     SK_ColorGREEN, SK_ColorYELLOW, SK_ColorBLUE, SK_ColorRED
 };
 
 DEF_GM( return new MegaLooperGM(MegaLooperGM::k0x0_Type); )
 DEF_GM( return new MegaLooperGM(MegaLooperGM::k4x1_Type); )
 DEF_GM( return new MegaLooperGM(MegaLooperGM::k1x4_Type); )