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

samplecode/SampleIdentityScale.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 "DecodeFile.h"
 #include "gm.h"
 
@@ skipping 47 matching lines @@
         const char *text;
 
         canvas->save();
         if (use_scale) {
           text = "Scaled = 1";
         } else {
 
           SkRect r = { 100, 100, 356, 356 };
           SkPath clipPath;
           clipPath.addRoundRect(r, SkIntToScalar(5), SkIntToScalar(5));
-          canvas->clipPath(clipPath, SkRegion::kIntersect_Op, SkToBool(1));
+          canvas->clipPath(clipPath, SkCanvas::kIntersect_Op, SkToBool(1));
           text = "Scaled = 0";
         }
         canvas->drawBitmap( fBM, 100, 100, &paint );
         canvas->restore();
         canvas->drawText( text, strlen(text), 100, 400, paint );
         this->inval(nullptr);
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new IdentityScaleView("mandrill_256.png"); }
 static SkViewRegister reg(MyFactory);