move remaining virtual draw methods to onDraw

BUG=skia:

Review URL: https://codereview.chromium.org/817723005

2 files changed, 5 insertions, 7 deletions

diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp
index d306cad6e9..ec3680c3a9 100644
--- a/tests/RecordDrawTest.cpp
+++ b/tests/RecordDrawTest.cpp
@@ -288,16 +288,14 @@ DEF_TEST(RecordDraw_drawImage, r){
         SkCanvasMock(int width, int height) : SkCanvas(width, height) {
             this->resetTestValues();
         }
-        virtual ~SkCanvasMock() {}
-        virtual void drawImage(const SkImage* image, SkScalar left, SkScalar top,
-                               const SkPaint* paint = NULL) SK_OVERRIDE {
 
+        void onDrawImage(const SkImage* image, SkScalar left, SkScalar top,
+                         const SkPaint* paint) SK_OVERRIDE {
             fDrawImageCalled = true;
         }
 
-        virtual void drawImageRect(const SkImage* image, const SkRect* src,
-                                   const SkRect& dst,
-                                   const SkPaint* paint = NULL) SK_OVERRIDE {
+        void onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
+                             const SkPaint* paint) SK_OVERRIDE {
             fDrawImageRectCalled = true;
         }
 
diff --git a/tests/TileGridTest.cpp b/tests/TileGridTest.cpp
index c063fb0310..3cb32070b3 100644
--- a/tests/TileGridTest.cpp
+++ b/tests/TileGridTest.cpp
@@ -23,7 +23,7 @@ class MockCanvas : public SkCanvas {
 public:
     MockCanvas(const SkBitmap& bm) : SkCanvas(bm) {}
 
-    virtual void drawRect(const SkRect& rect, const SkPaint&) {
+    void onDrawRect(const SkRect& rect, const SkPaint&) SK_OVERRIDE {
         // This capture occurs before quick reject.
         fRects.push(rect);
     }