use ClipOp instead of SkRegion for clipping

gm/aaclip.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 "gm.h"
 #include "SkCanvas.h"
 #include "SkPath.h"
@@ skipping 12 matching lines @@
     SkPaint foregroundPaint;
     foregroundPaint.setColor(SkColorSetRGB(0x0, 0x0, 0xDD));
     foregroundPaint.setAntiAlias(true);
 
     canvas->save();
     canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
     target.inset(SkIntToScalar(-2), SkIntToScalar(-2));
     canvas->drawRect(target, borderPaint);
     target.inset(SkIntToScalar(2), SkIntToScalar(2));
     canvas->drawRect(target, backgroundPaint);
-    canvas->clipRect(target, SkRegion::kIntersect_Op, true);
+    canvas->clipRect(target, kIntersect_SkClipOp, true);
     target.inset(SkIntToScalar(-4), SkIntToScalar(-4));
     canvas->drawRect(target, foregroundPaint);
     canvas->restore();
 }
 
 static void draw_square(SkCanvas* canvas, int x, int y) {
     SkRect target (SkRect::MakeWH(10 * SK_Scalar1, 10 * SK_Scalar1));
     draw(canvas, target, x, y);
 }
 
@@ skipping 146 matching lines @@
     virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 #if 0 // Disabled pending fix from reed@
 DEF_GM( return SkNEW(CGImageGM); )
 #endif
 #endif