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

gm/distantclip.cpp

 
 /*
  * Copyright 2012 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"
@@ skipping 21 matching lines @@
         SkPictureRecorder recorder;
         // We record a picture of huge vertical extents in which we clear the canvas to red, create
         // a 'extents' by 'extents' round rect clip at a vertical offset of 'offset', then draw
         // green into that.
         SkCanvas* rec = recorder.beginRecording(kExtents, kOffset + kExtents, nullptr, 0);
         rec->drawColor(SK_ColorRED);
         rec->save();
         SkRect r = SkRect::MakeXYWH(-kExtents, kOffset - kExtents, 2 * kExtents, 2 * kExtents);
         SkPath p;
         p.addRoundRect(r, 5, 5);
-        rec->clipPath(p, SkRegion::kIntersect_Op, true);
+        rec->clipPath(p, SkCanvas::kIntersect_Op, true);
         rec->drawColor(SK_ColorGREEN);
         rec->restore();
         sk_sp<SkPicture> pict(recorder.finishRecordingAsPicture());
 
         // Next we play that picture into another picture of the same size.
         pict->playback(recorder.beginRecording(pict->cullRect().width(),
                                                pict->cullRect().height(),
                                                nullptr, 0));
         sk_sp<SkPicture> pict2(recorder.finishRecordingAsPicture());
 
@@ skipping 10 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new DistantClipGM; }
 static GMRegistry reg(MyFactory);
 
 }