Index: src/utils/SkDeferredCanvas.cpp |
=================================================================== |
--- src/utils/SkDeferredCanvas.cpp (revision 10198) |
+++ src/utils/SkDeferredCanvas.cpp (working copy) |
@@ -186,58 +186,60 @@ |
// None of the following drawing methods should ever get called on the |
// deferred device |
- virtual void clear(SkColor color) |
+ virtual void clear(SkColor color) SK_OVERRIDE |
{SkASSERT(0);} |
- virtual void drawPaint(const SkDraw&, const SkPaint& paint) |
+ virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE |
{SkASSERT(0);} |
virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, |
size_t count, const SkPoint[], |
- const SkPaint& paint) |
+ const SkPaint& paint) SK_OVERRIDE |
{SkASSERT(0);} |
virtual void drawRect(const SkDraw&, const SkRect& r, |
- const SkPaint& paint) |
+ const SkPaint& paint) SK_OVERRIDE |
{SkASSERT(0);} |
virtual void drawPath(const SkDraw&, const SkPath& path, |
const SkPaint& paint, |
const SkMatrix* prePathMatrix = NULL, |
- bool pathIsMutable = false) |
+ bool pathIsMutable = false) SK_OVERRIDE |
{SkASSERT(0);} |
virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap, |
const SkIRect* srcRectOrNull, |
- const SkMatrix& matrix, const SkPaint& paint) |
+ const SkMatrix& matrix, const SkPaint& paint) SK_OVERRIDE |
{SkASSERT(0);} |
virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap, |
- int x, int y, const SkPaint& paint) |
+ int x, int y, const SkPaint& paint) SK_OVERRIDE |
{SkASSERT(0);} |
virtual void drawText(const SkDraw&, const void* text, size_t len, |
- SkScalar x, SkScalar y, const SkPaint& paint) |
+ SkScalar x, SkScalar y, const SkPaint& paint) SK_OVERRIDE |
{SkASSERT(0);} |
virtual void drawPosText(const SkDraw&, const void* text, size_t len, |
const SkScalar pos[], SkScalar constY, |
- int scalarsPerPos, const SkPaint& paint) |
+ int scalarsPerPos, const SkPaint& paint) SK_OVERRIDE |
{SkASSERT(0);} |
virtual void drawTextOnPath(const SkDraw&, const void* text, |
size_t len, const SkPath& path, |
const SkMatrix* matrix, |
- const SkPaint& paint) |
+ const SkPaint& paint) SK_OVERRIDE |
{SkASSERT(0);} |
+#ifdef SK_BUILD_FOR_ANDROID |
virtual void drawPosTextOnPath(const SkDraw& draw, const void* text, |
size_t len, const SkPoint pos[], |
const SkPaint& paint, |
const SkPath& path, |
- const SkMatrix* matrix) |
+ const SkMatrix* matrix) SK_OVERRIDE |
{SkASSERT(0);} |
+#endif |
virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode, |
int vertexCount, const SkPoint verts[], |
const SkPoint texs[], const SkColor colors[], |
SkXfermode* xmode, const uint16_t indices[], |
- int indexCount, const SkPaint& paint) |
+ int indexCount, const SkPaint& paint) SK_OVERRIDE |
{SkASSERT(0);} |
virtual void drawDevice(const SkDraw&, SkDevice*, int x, int y, |
- const SkPaint&) |
+ const SkPaint&) SK_OVERRIDE |
{SkASSERT(0);} |
private: |
- virtual void flush(); |
+ virtual void flush() SK_OVERRIDE; |
void beginRecording(); |
void init(); |