diff options
Diffstat (limited to 'src/utils/SkDeferredCanvas.cpp')
-rw-r--r-- | src/utils/SkDeferredCanvas.cpp | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp index c827be603c..7ea3bbbe30 100644 --- a/src/utils/SkDeferredCanvas.cpp +++ b/src/utils/SkDeferredCanvas.cpp @@ -14,7 +14,6 @@ #include "SkDrawFilter.h" #include "SkGPipe.h" #include "SkPaint.h" -#include "SkRRect.h" #include "SkShader.h" enum { @@ -783,15 +782,6 @@ bool SkDeferredCanvas::clipRect(const SkRect& rect, return val; } -bool SkDeferredCanvas::clipRRect(const SkRRect& rrect, - SkRegion::Op op, - bool doAntiAlias) { - this->drawingCanvas()->clipRRect(rrect, op, doAntiAlias); - bool val = this->INHERITED::clipRRect(rrect, op, doAntiAlias); - this->recordedDrawCommand(); - return val; -} - bool SkDeferredCanvas::clipPath(const SkPath& path, SkRegion::Op op, bool doAntiAlias) { @@ -836,35 +826,17 @@ void SkDeferredCanvas::drawPoints(PointMode mode, size_t count, this->recordedDrawCommand(); } -void SkDeferredCanvas::drawOval(const SkRect& rect, const SkPaint& paint) { - AutoImmediateDrawIfNeeded autoDraw(*this, &paint); - this->drawingCanvas()->drawOval(rect, paint); - this->recordedDrawCommand(); -} - void SkDeferredCanvas::drawRect(const SkRect& rect, const SkPaint& paint) { if (fDeferredDrawing && this->isFullFrame(&rect, &paint) && isPaintOpaque(&paint)) { this->getDeferredDevice()->skipPendingCommands(); } - + AutoImmediateDrawIfNeeded autoDraw(*this, &paint); this->drawingCanvas()->drawRect(rect, paint); this->recordedDrawCommand(); } -void SkDeferredCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) { - if (rrect.isRect()) { - this->SkDeferredCanvas::drawRect(rrect.getBounds(), paint); - } else if (rrect.isOval()) { - this->SkDeferredCanvas::drawOval(rrect.getBounds(), paint); - } else { - AutoImmediateDrawIfNeeded autoDraw(*this, &paint); - this->drawingCanvas()->drawRRect(rrect, paint); - this->recordedDrawCommand(); - } -} - void SkDeferredCanvas::drawPath(const SkPath& path, const SkPaint& paint) { AutoImmediateDrawIfNeeded autoDraw(*this, &paint); this->drawingCanvas()->drawPath(path, paint); |