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

samplecode/SampleComplexClip.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 "SampleCode.h"
 #include "SkCanvas.h"
 #include "SkPath.h"
 #include "SkView.h"
@@ skipping 61 matching lines @@
         paint.setStrokeWidth(0);
 
         canvas->translate(SkIntToScalar(10),SkIntToScalar(10));
         canvas->drawPath(path, pathPaint);
         paint.setColor(colorA);
         canvas->drawPath(clipA, paint);
         paint.setColor(colorB);
         canvas->drawPath(clipB, paint);
 
         static const struct {
-            SkRegion::Op fOp;
-            const char*  fName;
+            SkCanvas::ClipOp fOp;
+            const char*      fName;
         } gOps[] = { //extra spaces in names for measureText
-            {SkRegion::kIntersect_Op,         "Isect "},
-            {SkRegion::kDifference_Op,        "Diff " },
-            {SkRegion::kUnion_Op,             "Union "},
-            {SkRegion::kXOR_Op,               "Xor "  },
-            {SkRegion::kReverseDifference_Op, "RDiff "}
+            {SkCanvas::kIntersect_Op,         "Isect "},
+            {SkCanvas::kDifference_Op,        "Diff " },
+            {SkCanvas::kUnion_Op,             "Union "},
+            {SkCanvas::kXOR_Op,               "Xor "  },
+            {SkCanvas::kReverseDifference_Op, "RDiff "}
         };
 
         canvas->translate(0, SkIntToScalar(40));
         canvas->scale(3 * SK_Scalar1 / 4, 3 * SK_Scalar1 / 4);
         canvas->save();
 
         for (int invA = 0; invA < 2; ++invA) {
             for (size_t op = 0; op < SK_ARRAY_COUNT(gOps); ++op) {
                 size_t idx = invA * SK_ARRAY_COUNT(gOps) + op;
                 if (!(idx % 3)) {
@@ skipping 43 matching lines @@
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new ComplexClipView; }
 static SkViewRegister reg(MyFactory);