use ClipOp instead of SkRegion for clipping

tests/CanvasTest.cpp

Index: tests/CanvasTest.cpp
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp
index d5ddfe6fb05221c3b94848ccbe759ffef808a6b0..abd48876271905fb736b5be5e64bd527966aa382 100644
--- a/tests/CanvasTest.cpp
+++ b/tests/CanvasTest.cpp
@@ -193,13 +193,13 @@ public:
     Canvas2CanvasClipVisitor(SkCanvas* target) : fTarget(target) {}
 
     virtual void clipRect(const SkRect& r, SkRegion::Op op, bool aa) SK_OVERRIDE {
-        fTarget->clipRect(r, op, aa);
+        fTarget->legacyClipRect(r, op, aa);
     }
     virtual void clipRRect(const SkRRect& r, SkRegion::Op op, bool aa) SK_OVERRIDE {
-        fTarget->clipRRect(r, op, aa);
+        fTarget->legacyClipRRect(r, op, aa);
     }
     virtual void clipPath(const SkPath& p, SkRegion::Op op, bool aa) SK_OVERRIDE {
-        fTarget->clipPath(p, op, aa);
+        fTarget->legacyClipPath(p, op, aa);
     }
 
 private:
@@ -341,7 +341,7 @@ SIMPLE_TEST_STEP(Concat, concat(d.fMatrix));
 SIMPLE_TEST_STEP(SetMatrix, setMatrix(d.fMatrix));
 SIMPLE_TEST_STEP(ClipRect, clipRect(d.fRect));
 SIMPLE_TEST_STEP(ClipPath, clipPath(d.fPath));
-SIMPLE_TEST_STEP(ClipRegion, clipRegion(d.fRegion, SkRegion::kReplace_Op));
+SIMPLE_TEST_STEP(ClipRegion, legacyClipRegion(d.fRegion, SkRegion::kReplace_Op));
 SIMPLE_TEST_STEP(Clear, clear(d.fColor));
 SIMPLE_TEST_STEP(BeginGroup, beginCommentGroup(d.fText.c_str()));
 SIMPLE_TEST_STEP(AddComment, addComment(d.fText.c_str(), d.fText.c_str()));