| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2013 Google Inc. | 3 * Copyright 2013 Google Inc. |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 #include "SkDeferredCanvas.h" | 9 #include "SkDeferredCanvas.h" |
| 10 | 10 |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 {SkASSERT(0);} | 190 {SkASSERT(0);} |
| 191 virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE | 191 virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE |
| 192 {SkASSERT(0);} | 192 {SkASSERT(0);} |
| 193 virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, | 193 virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, |
| 194 size_t count, const SkPoint[], | 194 size_t count, const SkPoint[], |
| 195 const SkPaint& paint) SK_OVERRIDE | 195 const SkPaint& paint) SK_OVERRIDE |
| 196 {SkASSERT(0);} | 196 {SkASSERT(0);} |
| 197 virtual void drawRect(const SkDraw&, const SkRect& r, | 197 virtual void drawRect(const SkDraw&, const SkRect& r, |
| 198 const SkPaint& paint) SK_OVERRIDE | 198 const SkPaint& paint) SK_OVERRIDE |
| 199 {SkASSERT(0);} | 199 {SkASSERT(0);} |
| 200 virtual void drawPath(const SkDraw&, const SkPath& path, | 200 virtual void onDrawPath(const SkDraw&, const SkPath& path, |
| 201 const SkPaint& paint, | 201 const SkPaint& paint, |
| 202 const SkMatrix* prePathMatrix = NULL, | 202 const SkMatrix* prePathMatrix = NULL, |
| 203 bool pathIsMutable = false) SK_OVERRIDE | 203 bool pathIsMutable = false) SK_OVERRIDE |
| 204 {SkASSERT(0);} | 204 {SkASSERT(0);} |
| 205 virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap, | 205 virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap, |
| 206 const SkMatrix& matrix, const SkPaint& paint) SK_OVE
RRIDE | 206 const SkMatrix& matrix, const SkPaint& paint) SK_OVE
RRIDE |
| 207 {SkASSERT(0);} | 207 {SkASSERT(0);} |
| 208 virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap, | 208 virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap, |
| 209 int x, int y, const SkPaint& paint) SK_OVERRIDE | 209 int x, int y, const SkPaint& paint) SK_OVERRIDE |
| 210 {SkASSERT(0);} | 210 {SkASSERT(0);} |
| (...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 839 this->drawingCanvas()->drawPoints(mode, count, pts, paint); | 839 this->drawingCanvas()->drawPoints(mode, count, pts, paint); |
| 840 this->recordedDrawCommand(); | 840 this->recordedDrawCommand(); |
| 841 } | 841 } |
| 842 | 842 |
| 843 void SkDeferredCanvas::drawOval(const SkRect& rect, const SkPaint& paint) { | 843 void SkDeferredCanvas::drawOval(const SkRect& rect, const SkPaint& paint) { |
| 844 AutoImmediateDrawIfNeeded autoDraw(*this, &paint); | 844 AutoImmediateDrawIfNeeded autoDraw(*this, &paint); |
| 845 this->drawingCanvas()->drawOval(rect, paint); | 845 this->drawingCanvas()->drawOval(rect, paint); |
| 846 this->recordedDrawCommand(); | 846 this->recordedDrawCommand(); |
| 847 } | 847 } |
| 848 | 848 |
| 849 void SkDeferredCanvas::drawRect(const SkRect& rect, const SkPaint& paint) { | 849 void SkDeferredCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) { |
| 850 if (fDeferredDrawing && this->isFullFrame(&rect, &paint) && | 850 if (fDeferredDrawing && this->isFullFrame(&rect, &paint) && |
| 851 isPaintOpaque(&paint)) { | 851 isPaintOpaque(&paint)) { |
| 852 this->getDeferredDevice()->skipPendingCommands(); | 852 this->getDeferredDevice()->skipPendingCommands(); |
| 853 } | 853 } |
| 854 | 854 |
| 855 AutoImmediateDrawIfNeeded autoDraw(*this, &paint); | 855 AutoImmediateDrawIfNeeded autoDraw(*this, &paint); |
| 856 this->drawingCanvas()->drawRect(rect, paint); | 856 this->drawingCanvas()->drawRect(rect, paint); |
| 857 this->recordedDrawCommand(); | 857 this->recordedDrawCommand(); |
| 858 } | 858 } |
| 859 | 859 |
| 860 void SkDeferredCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) { | 860 void SkDeferredCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) { |
| 861 if (rrect.isRect()) { | 861 if (rrect.isRect()) { |
| 862 this->SkDeferredCanvas::drawRect(rrect.getBounds(), paint); | 862 this->SkDeferredCanvas::drawRect(rrect.getBounds(), paint); |
| 863 } else if (rrect.isOval()) { | 863 } else if (rrect.isOval()) { |
| 864 this->SkDeferredCanvas::drawOval(rrect.getBounds(), paint); | 864 this->SkDeferredCanvas::drawOval(rrect.getBounds(), paint); |
| 865 } else { | 865 } else { |
| 866 AutoImmediateDrawIfNeeded autoDraw(*this, &paint); | 866 AutoImmediateDrawIfNeeded autoDraw(*this, &paint); |
| 867 this->drawingCanvas()->drawRRect(rrect, paint); | 867 this->drawingCanvas()->drawRRect(rrect, paint); |
| 868 this->recordedDrawCommand(); | 868 this->recordedDrawCommand(); |
| 869 } | 869 } |
| 870 } | 870 } |
| 871 | 871 |
| 872 void SkDeferredCanvas::drawPath(const SkPath& path, const SkPaint& paint) { | 872 void SkDeferredCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) { |
| 873 AutoImmediateDrawIfNeeded autoDraw(*this, &paint); | 873 AutoImmediateDrawIfNeeded autoDraw(*this, &paint); |
| 874 this->drawingCanvas()->drawPath(path, paint); | 874 this->drawingCanvas()->drawPath(path, paint); |
| 875 this->recordedDrawCommand(); | 875 this->recordedDrawCommand(); |
| 876 } | 876 } |
| 877 | 877 |
| 878 void SkDeferredCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar left, | 878 void SkDeferredCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar left, |
| 879 SkScalar top, const SkPaint* paint) { | 879 SkScalar top, const SkPaint* paint) { |
| 880 SkRect bitmapRect = SkRect::MakeXYWH(left, top, | 880 SkRect bitmapRect = SkRect::MakeXYWH(left, top, |
| 881 SkIntToScalar(bitmap.width()), SkIntToScalar(bitmap.height())); | 881 SkIntToScalar(bitmap.width()), SkIntToScalar(bitmap.height())); |
| 882 if (fDeferredDrawing && | 882 if (fDeferredDrawing && |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1003 SkDrawFilter* SkDeferredCanvas::setDrawFilter(SkDrawFilter* filter) { | 1003 SkDrawFilter* SkDeferredCanvas::setDrawFilter(SkDrawFilter* filter) { |
| 1004 this->drawingCanvas()->setDrawFilter(filter); | 1004 this->drawingCanvas()->setDrawFilter(filter); |
| 1005 this->INHERITED::setDrawFilter(filter); | 1005 this->INHERITED::setDrawFilter(filter); |
| 1006 this->recordedDrawCommand(); | 1006 this->recordedDrawCommand(); |
| 1007 return filter; | 1007 return filter; |
| 1008 } | 1008 } |
| 1009 | 1009 |
| 1010 SkCanvas* SkDeferredCanvas::canvasForDrawIter() { | 1010 SkCanvas* SkDeferredCanvas::canvasForDrawIter() { |
| 1011 return this->drawingCanvas(); | 1011 return this->drawingCanvas(); |
| 1012 } | 1012 } |
| OLD | NEW |