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

gm/complexclip2.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 "gm.h"
 #include "SkCanvas.h"
@@ skipping 65 matching lines @@
         fRects[3].set(xA, yC, xD, yF);
         fRRects[3].setRectXY(fRects[3], 7, 7);
         fPaths[3].addRoundRect(fRects[3], 5, 5);
         fRectColors[3] = SK_ColorYELLOW;
 
         fRects[4].set(xC, yC, xF, yF);
         fRRects[4].setRectXY(fRects[4], 7, 7);
         fPaths[4].addRoundRect(fRects[4], 5, 5);
         fRectColors[4] = SK_ColorCYAN;
 
-        SkRegion::Op ops[] = {
-            SkRegion::kDifference_Op,
-            SkRegion::kIntersect_Op,
-            SkRegion::kUnion_Op,
-            SkRegion::kXOR_Op,
-            SkRegion::kReverseDifference_Op,
-            SkRegion::kReplace_Op,
+        SkCanvas::ClipOp ops[] = {
+            SkCanvas::kDifference_Op,
+            SkCanvas::kIntersect_Op,
+            SkCanvas::kUnion_Op,
+            SkCanvas::kXOR_Op,
+            SkCanvas::kReverseDifference_Op,
+            SkCanvas::kReplace_Op,
         };
 
         SkRandom r;
         for (int i = 0; i < kRows; ++i) {
             for (int j = 0; j < kCols; ++j) {
                 for (int k = 0; k < 5; ++k) {
                     fOps[j*kRows+i][k] = ops[r.nextU() % SK_ARRAY_COUNT(ops)];
                 }
             }
         }
@@ skipping 90 matching lines @@
             }
         }
     }
 private:
     Clip fClip;
     bool fAntiAlias;
     SkRect fRects[5];
     SkRRect fRRects[5];
     SkPath fPaths[5];
     SkColor fRectColors[5];
-    SkRegion::Op fOps[kRows * kCols][5];
+    SkCanvas::ClipOp fOps[kRows * kCols][5];
     SkScalar fWidth;
     SkScalar fHeight;
     SkScalar fTotalWidth;
     SkScalar fTotalHeight;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 // bw
 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kRect_Clip, false); )
 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kRRect_Clip, false); )
 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kPath_Clip, false); )
 
 // aa
 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kRect_Clip, true); )
 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kRRect_Clip, true); )
 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kPath_Clip, true); )
 
 }