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

bench/AAClipBench.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 "Benchmark.h"
 #include "SkAAClip.h"
 #include "SkCanvas.h"
@@ skipping 41 matching lines @@
             // jostle the clip regions each time to prevent caching
             fClipRect.offset((i % 2) == 0 ? SkIntToScalar(10) : SkIntToScalar(-10), 0);
             fClipPath.reset();
             fClipPath.addRoundRect(fClipRect,
                                    SkIntToScalar(5), SkIntToScalar(5));
             SkASSERT(fClipPath.isConvex());
 
             canvas->save();
 #if 1
             if (fDoPath) {
-                canvas->clipPath(fClipPath, SkRegion::kReplace_Op, fDoAA);
+                canvas->clipPath(fClipPath, SkCanvas::kReplace_Op, fDoAA);
             } else {
-                canvas->clipRect(fClipRect, SkRegion::kReplace_Op, fDoAA);
+                canvas->clipRect(fClipRect, SkCanvas::kReplace_Op, fDoAA);
             }
 
             canvas->drawRect(fDrawRect, paint);
 #else
             // this path tests out directly draw the clip primitive
             // use it to comparing just drawing the clip vs. drawing using
             // the clip
             if (fDoPath) {
                 canvas->drawPath(fClipPath, paint);
             } else {
@@ skipping 48 matching lines @@
 
             SkRect temp = SkRect::MakeLTRB(0, 0,
                                            fSizes[depth].fX, fSizes[depth].fY);
             temp.offset(offset);
 
             SkPath path;
             path.addRoundRect(temp, SkIntToScalar(3), SkIntToScalar(3));
             SkASSERT(path.isConvex());
 
             canvas->clipPath(path,
-                             0 == depth ? SkRegion::kReplace_Op :
-                                          SkRegion::kIntersect_Op,
+                             0 == depth ? SkCanvas::kReplace_Op :
+                                          SkCanvas::kIntersect_Op,
                              fDoAA);
 
             if (kNestingDepth == depth) {
                 // we only draw the draw rect at the lowest nesting level
                 SkPaint paint;
                 paint.setColor(0xff000000 | fRandom.nextU());
                 canvas->drawRect(fDrawRect, paint);
             } else {
                 SkPoint childOffset = offset;
                 this->recurse(canvas, depth+1, childOffset);
@@ skipping 103 matching lines @@
 DEF_BENCH(return new AAClipBuilderBench(false, true);)
 DEF_BENCH(return new AAClipBuilderBench(true, false);)
 DEF_BENCH(return new AAClipBuilderBench(true, true);)
 DEF_BENCH(return new AAClipRegionBench();)
 DEF_BENCH(return new AAClipBench(false, false);)
 DEF_BENCH(return new AAClipBench(false, true);)
 DEF_BENCH(return new AAClipBench(true, false);)
 DEF_BENCH(return new AAClipBench(true, true);)
 DEF_BENCH(return new NestedAAClipBench(false);)
 DEF_BENCH(return new NestedAAClipBench(true);)