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

gm/rrectclipdrawpaint.cpp

Index: gm/rrectclipdrawpaint.cpp
diff --git a/gm/rrectclipdrawpaint.cpp b/gm/rrectclipdrawpaint.cpp
index 172faccd9ecd18b2f6a88943065f960dc7f552ea..74b57835c8d41d8b669496f66356a4d40d1a7ed9 100644
--- a/gm/rrectclipdrawpaint.cpp
+++ b/gm/rrectclipdrawpaint.cpp
@@ -21,14 +21,14 @@ DEF_SIMPLE_GM(rrect_clip_draw_paint, canvas, 256, 256) {
 
     const SkRect layerRect = SkRect::MakeWH(256.f, 256.f);
     canvas->saveLayer(layerRect, nullptr);
-    canvas->clipRRect(rrect, SkRegion::kIntersect_Op, true);
+    canvas->clipRRect(rrect, SkCanvas::kIntersect_Op, true);
     canvas->drawPaint(p);
     canvas->restore();
 
     canvas->concat(zoomOut);
     p.setColor(SK_ColorBLUE);
     canvas->saveLayer(layerRect, nullptr);
-    canvas->clipRRect(rrect, SkRegion::kIntersect_Op, false);
+    canvas->clipRRect(rrect, SkCanvas::kIntersect_Op, false);
     canvas->drawPaint(p);
     canvas->restore();
 
@@ -38,7 +38,7 @@ DEF_SIMPLE_GM(rrect_clip_draw_paint, canvas, 256, 256) {
                                              SkShader::kClamp_TileMode));
     canvas->concat(zoomOut);
     canvas->saveLayer(layerRect, nullptr);
-    canvas->clipRRect(rrect, SkRegion::kIntersect_Op, true);
+    canvas->clipRRect(rrect, SkCanvas::kIntersect_Op, true);
     canvas->drawPaint(p);
     canvas->restore();
 
@@ -47,7 +47,7 @@ DEF_SIMPLE_GM(rrect_clip_draw_paint, canvas, 256, 256) {
                                              SkShader::kClamp_TileMode));
     canvas->concat(zoomOut);
     canvas->saveLayer(layerRect, nullptr);
-    canvas->clipRRect(rrect, SkRegion::kIntersect_Op, false);
+    canvas->clipRRect(rrect, SkCanvas::kIntersect_Op, false);
     canvas->drawPaint(p);
     canvas->restore();
 }