allow clip calls w/o op param, remove unnecessary kReplace ops
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2357333002
Review-Url: https://codereview.chromium.org/2357333002
diff --git a/samplecode/SampleClipDrawMatch.cpp b/samplecode/SampleClipDrawMatch.cpp
index ddb9f66..ea30cc6 100644
--- a/samplecode/SampleClipDrawMatch.cpp
+++ b/samplecode/SampleClipDrawMatch.cpp
@@ -164,43 +164,43 @@
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;
}