I don't want these changes as part of the "allow bleeding" CL.

R=bsalomon@google.com

Author: robertphillips@google.com

Review URL: https://chromiumcodereview.appspot.com/19842002

git-svn-id: http://skia.googlecode.com/svn/trunk@10256 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp
index da3c72e..68d0602 100644 (file)
--- a/src/utils/SkDeferredCanvas.cpp
+++ b/src/utils/SkDeferredCanvas.cpp
@@ -186,58 +186,60 @@ protected:
 
     // 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();

diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp
index af2d300..9d3872e 100644 (file)
--- a/tests/DeferredCanvasTest.cpp
+++ b/tests/DeferredCanvasTest.cpp
@@ -244,7 +244,7 @@ public:
     }
     virtual void drawBitmap(const SkDraw&, const SkBitmap&,
                             const SkIRect*,
-                            const SkMatrix&, const SkPaint&) {
+                            const SkMatrix&, const SkPaint&) SK_OVERRIDE {
         fDrawBitmapCallCount++;
     }
 

diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp
index 7b85fc8..1df6340 100644 (file)
--- a/tests/LayerDrawLooperTest.cpp
+++ b/tests/LayerDrawLooperTest.cpp
@@ -23,7 +23,8 @@ class FakeDevice : public SkDevice {
 public:
     FakeDevice() : SkDevice(SkBitmap::kARGB_8888_Config, 100, 100) { }
 
-    virtual void drawRect(const SkDraw& draw, const SkRect& r, const SkPaint& paint) {
+    virtual void drawRect(const SkDraw& draw, const SkRect& r, 
+                          const SkPaint& paint) SK_OVERRIDE {
         fLastMatrix = *draw.fMatrix;
         SkDevice::drawRect(draw, r, paint);
     }