Index: src/utils/debugger/SkDebugCanvas.cpp |
=================================================================== |
--- src/utils/debugger/SkDebugCanvas.cpp (revision 13622) |
+++ src/utils/debugger/SkDebugCanvas.cpp (working copy) |
@@ -43,7 +43,8 @@ |
large.roundOut(&largeIRect); |
SkASSERT(!largeIRect.isEmpty()); |
#endif |
- INHERITED::clipRect(large, SkRegion::kReplace_Op, false); |
+ // call the base class' version to avoid adding a draw command |
+ this->INHERITED::onClipRect(large, SkRegion::kReplace_Op, kHard_ClipEdgeStyle); |
} |
SkDebugCanvas::~SkDebugCanvas() { |
@@ -297,24 +298,20 @@ |
addDrawCommand(new SkClearCommand(color)); |
} |
-bool SkDebugCanvas::clipPath(const SkPath& path, SkRegion::Op op, bool doAA) { |
- addDrawCommand(new SkClipPathCommand(path, op, doAA)); |
- return true; |
+void SkDebugCanvas::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) { |
+ this->addDrawCommand(new SkClipPathCommand(path, op, kSoft_ClipEdgeStyle == edgeStyle)); |
} |
-bool SkDebugCanvas::clipRect(const SkRect& rect, SkRegion::Op op, bool doAA) { |
- addDrawCommand(new SkClipRectCommand(rect, op, doAA)); |
- return true; |
+void SkDebugCanvas::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) { |
+ this->addDrawCommand(new SkClipRectCommand(rect, op, kSoft_ClipEdgeStyle == edgeStyle)); |
} |
-bool SkDebugCanvas::clipRRect(const SkRRect& rrect, SkRegion::Op op, bool doAA) { |
- addDrawCommand(new SkClipRRectCommand(rrect, op, doAA)); |
- return true; |
+void SkDebugCanvas::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) { |
+ this->addDrawCommand(new SkClipRRectCommand(rrect, op, kSoft_ClipEdgeStyle == edgeStyle)); |
} |
-bool SkDebugCanvas::clipRegion(const SkRegion& region, SkRegion::Op op) { |
- addDrawCommand(new SkClipRegionCommand(region, op)); |
- return true; |
+void SkDebugCanvas::onClipRegion(const SkRegion& region, SkRegion::Op op) { |
+ this->addDrawCommand(new SkClipRegionCommand(region, op)); |
} |
bool SkDebugCanvas::concat(const SkMatrix& matrix) { |