allow clip calls w/o op param, remove unnecessary kReplace ops

samplecode/SampleClipDrawMatch.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SampleCode.h"
 #include "SkCanvas.h"
 #include "SkInterpolator.h"
@@ skipping 146 matching lines @@
         }
         return this->INHERITED::onQuery(evt);
     }
 
     void drawClippedGeom(SkCanvas* canvas, const SkPoint& offset, bool useAA) {
 
         int count = canvas->save();
 
         switch (fGeom) {
         case kRect_Geometry:
-            canvas->clipRect(create_rect(offset), SkCanvas::kReplace_Op, useAA);
+            canvas->clipRect(create_rect(offset), useAA);
             break;
         case kRRect_Geometry:
-            canvas->clipRRect(create_rrect(offset), SkCanvas::kReplace_Op, useAA);
+            canvas->clipRRect(create_rrect(offset), useAA);
             break;
         case kCircle_Geometry:
-            canvas->clipRRect(create_circle(offset), SkCanvas::kReplace_Op, useAA);
+            canvas->clipRRect(create_circle(offset), useAA);
             break;
         case kConvexPath_Geometry:
-            canvas->clipPath(create_convex_path(offset), SkCanvas::kReplace_Op, useAA);
+            canvas->clipPath(create_convex_path(offset), useAA);
             break;
         case kConcavePath_Geometry:
-            canvas->clipPath(create_concave_path(offset), SkCanvas::kReplace_Op, useAA);
+            canvas->clipPath(create_concave_path(offset), useAA);
             break;
         case kRectAndRect_Geometry: {
             SkRect r = create_rect(offset);
             r.offset(fSign * kXlate, fSign * kXlate);
-            canvas->clipRect(r, SkCanvas::kReplace_Op, true); // AA here forces shader clips
-            canvas->clipRect(create_rect(offset), SkCanvas::kIntersect_Op, useAA);
+            canvas->clipRect(r, true); // AA here forces shader clips
+            canvas->clipRect(create_rect(offset), useAA);
             } break;
         case kRectAndRRect_Geometry: {
             SkRect r = create_rect(offset);
             r.offset(fSign * kXlate, fSign * kXlate);
-            canvas->clipRect(r, SkCanvas::kReplace_Op, true); // AA here forces shader clips
-            canvas->clipRRect(create_rrect(offset), SkCanvas::kIntersect_Op, useAA);
+            canvas->clipRect(r, true); // AA here forces shader clips
+            canvas->clipRRect(create_rrect(offset), useAA);
             } break;
         case kRectAndConvex_Geometry: {
             SkRect r = create_rect(offset);
             r.offset(fSign * kXlate, fSign * kXlate);
-            canvas->clipRect(r, SkCanvas::kReplace_Op, true); // AA here forces shader clips
-            canvas->clipPath(create_convex_path(offset), SkCanvas::kIntersect_Op, useAA);
+            canvas->clipRect(r, true); // AA here forces shader clips
+            canvas->clipPath(create_convex_path(offset), useAA);
             } break;
         case kRectAndConcave_Geometry: {
             SkRect r = create_rect(offset);
             r.offset(fSign * kXlate, fSign * kXlate);
-            canvas->clipRect(r, SkCanvas::kReplace_Op, true); // AA here forces shader clips
-            canvas->clipPath(create_concave_path(offset), SkCanvas::kIntersect_Op, useAA);
+            canvas->clipRect(r, true); // AA here forces shader clips
+            canvas->clipPath(create_concave_path(offset), useAA);
             } break;
         }
 
         SkISize size = canvas->getDeviceSize();
         SkRect bigR = SkRect::MakeWH(SkIntToScalar(size.width()), SkIntToScalar(size.height()));
 
         SkPaint p;
         p.setColor(SK_ColorRED);
 
         canvas->drawRect(bigR, p);
@@ skipping 40 matching lines @@
     int             fSign;
     const double    fStart = SkTime::GetMSecs();
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new ClipDrawMatchView; }
 static SkViewRegister reg(MyFactory);