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

gm/complexclip3.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 "SkCanvas.h"
 #include "SkPath.h"
 
@@ skipping 34 matching lines @@
         if (!fDoSimpleClipFirst) {
             SkTSwap<SkPath*>(firstClip, secondClip);
         }
 
         SkPaint paint;
         paint.setAntiAlias(true);
         sk_tool_utils::set_portable_typeface(&paint);
         paint.setTextSize(SkIntToScalar(20));
 
         constexpr struct {
-            SkRegion::Op fOp;
-            const char*  fName;
+            SkCanvas::ClipOp fOp;
+            const char*      fName;
         } gOps[] = {
-            {SkRegion::kIntersect_Op,         "I"},
-            {SkRegion::kDifference_Op,        "D" },
-            {SkRegion::kUnion_Op,             "U"},
-            {SkRegion::kXOR_Op,               "X"  },
-            {SkRegion::kReverseDifference_Op, "R"}
+            {SkCanvas::kIntersect_Op,         "I"},
+            {SkCanvas::kDifference_Op,        "D" },
+            {SkCanvas::kUnion_Op,             "U"},
+            {SkCanvas::kXOR_Op,               "X"  },
+            {SkCanvas::kReverseDifference_Op, "R"}
         };
 
         canvas->translate(SkIntToScalar(20), SkIntToScalar(20));
         canvas->scale(3 * SK_Scalar1 / 4, 3 * SK_Scalar1 / 4);
 
         SkPaint pathPaint;
         pathPaint.setAntiAlias(true);
         pathPaint.setColor(gPathColor);
 
         for (int invA = 0; invA < 2; ++invA) {
             for (int aaBits = 0; aaBits < 4; ++aaBits) {
                 canvas->save();
                 for (size_t op = 0; op < SK_ARRAY_COUNT(gOps); ++op) {
                     for (int invB = 0; invB < 2; ++invB) {
                         bool doAAA = SkToBool(aaBits & 1);
                         bool doAAB = SkToBool(aaBits & 2);
                         bool doInvA = SkToBool(invA);
                         bool doInvB = SkToBool(invB);
                         canvas->save();
                         // set clip
                         firstClip->setFillType(doInvA ? SkPath::kInverseEvenOdd_FillType :
                                                SkPath::kEvenOdd_FillType);
                         secondClip->setFillType(doInvB ? SkPath::kInverseEvenOdd_FillType :
                                                 SkPath::kEvenOdd_FillType);
-                        canvas->clipPath(*firstClip, SkRegion::kIntersect_Op, doAAA);
+                        canvas->clipPath(*firstClip, SkCanvas::kIntersect_Op, doAAA);
                         canvas->clipPath(*secondClip, gOps[op].fOp, doAAB);
 
                         // draw rect clipped
                         SkRect r = { 0, 0, 100, 100 };
                         canvas->drawRect(r, pathPaint);
                         canvas->restore();
 
 
                         SkScalar txtX = SkIntToScalar(10);
                         paint.setColor(SK_ColorBLACK);
@@ skipping 25 matching lines @@
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 // Simple clip first
 DEF_GM( return new ComplexClip3GM(true); )
 // Complex clip first
 DEF_GM( return new ComplexClip3GM(false); )
 }