use ClipOp instead of SkRegion for clipping

tests/DeferredCanvasTest.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 "../src/image/SkImagePriv.h"
 #include "../src/image/SkSurface_Base.h"
 #include "SkBitmap.h"
@@ skipping 347 matching lines @@
         paint.setStyle(SkPaint::kFill_Style);
         paint.setAlpha(255);
         canvas->drawRect(partialRect, paint);
         REPORTER_ASSERT(reporter, !canvas->isFreshFrame());
     }
 
     // Verify that incomplete coverage due to clipping does not trigger a fresh
     // frame
     {
         canvas->save();
-        canvas->clipRect(partialRect, SkRegion::kIntersect_Op, false);
+        canvas->clipRect(partialRect);
         SkPaint paint;
         paint.setStyle(SkPaint::kFill_Style);
         paint.setAlpha(255);
         canvas->drawRect(fullRect, paint);
         canvas->restore();
         REPORTER_ASSERT(reporter, !canvas->isFreshFrame());
     }
     {
         canvas->save();
         SkPaint paint;
         paint.setStyle(SkPaint::kFill_Style);
         paint.setAlpha(255);
         SkPath path;
         path.addCircle(SkIntToScalar(0), SkIntToScalar(0), SkIntToScalar(2));
-        canvas->clipPath(path, SkRegion::kIntersect_Op, false);
+        canvas->clipPath(path);
         canvas->drawRect(fullRect, paint);
         canvas->restore();
         REPORTER_ASSERT(reporter, !canvas->isFreshFrame());
     }
 
     // Verify that stroked rect does not trigger a fresh frame
     {
         SkPaint paint;
         paint.setStyle(SkPaint::kStroke_Style);
         paint.setAlpha(255);
@@ skipping 455 matching lines @@
         if (i == 1) {
             canvas->setSurface(newSurface);
             size = SkISize::Make(4, 4);
         }
 
         // verify that canvas size is correctly initialized or set
         REPORTER_ASSERT(reporter, size == canvas->getCanvasSize());
 
         // Verify that clear, clip and draw the canvas will not change its size
         canvas->clear(0x00000000);
-        canvas->clipRect(clip, SkRegion::kIntersect_Op, false);
+        canvas->clipRect(clip);
         canvas->drawRect(rect, paint);
         REPORTER_ASSERT(reporter, size == canvas->getCanvasSize());
 
         // Verify that flush the canvas will not change its size
         canvas->flush();
         REPORTER_ASSERT(reporter, size == canvas->getCanvasSize());
 
         // Verify that clear canvas with saved state will not change its size
         canvas->save();
         canvas->clear(0xFFFFFFFF);
@@ skipping 29 matching lines @@
     TestDeferredCanvasSurface(reporter, NULL);
     TestDeferredCanvasSetSurface(reporter, NULL);
 }
 
 DEF_GPUTEST(DeferredCanvas_GPU, reporter, factory) {
     if (factory != NULL) {
         TestDeferredCanvasSurface(reporter, factory);
         TestDeferredCanvasSetSurface(reporter, factory);
     }
 }