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

tests/ReadPixelsTest.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 "SkCanvas.h"
 #include "SkColorPriv.h"
 #include "SkMathPriv.h"
-#include "SkRegion.h"
 #include "SkSurface.h"
 #include "Test.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "SkGr.h"
 #endif
 
 #include <initializer_list>
 
@@ skipping 83 matching lines @@
                 *pixel = get_src_color(x, y);
             }
         }
     }
     return bmp;
 }
 
 static void fill_src_canvas(SkCanvas* canvas) {
     canvas->save();
     canvas->setMatrix(SkMatrix::I());
-    canvas->clipRect(DEV_RECT_S, SkRegion::kReplace_Op);
+    canvas->clipRect(DEV_RECT_S, SkCanvas::kReplace_Op);
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     canvas->drawBitmap(make_src_bitmap(), 0, 0, &paint);
     canvas->restore();
 }
 
 #if SK_SUPPORT_GPU
 static void fill_src_texture(GrTexture* texture) {
     SkBitmap bmp = make_src_bitmap();
     bmp.lockPixels();
@@ skipping 318 matching lines @@
         desc.fHeight = DEV_H;
         desc.fConfig = kSkia8888_GrPixelConfig;
         desc.fOrigin = origin;
         desc.fFlags = kNone_GrSurfaceFlags;
         texture.reset(ctxInfo.grContext()->textureProvider()->createTexture(desc,
                                                                             SkBudgeted::kNo));
         test_readpixels_texture(reporter, texture);
     }
 }
 #endif