Revert of Revert of move remaining virtual draw methods to onDraw

tests/RecordDrawTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #include "RecordTestUtils.h"
 
@@ skipping 270 matching lines @@
         REPORTER_ASSERT(r, sloppy_rect_eq(bbh.fEntries[2].bounds, SkRect::MakeLTRB(10, 10, 40, 40)));
     }
 }
 
 DEF_TEST(RecordDraw_drawImage, r){
     class SkCanvasMock : public SkCanvas {
     public:
         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;
         }
 
         void resetTestValues() {
             fDrawImageCalled = fDrawImageRectCalled = false;
         }
 
         bool fDrawImageCalled;
         bool fDrawImageRectCalled;
     };
@@ skipping 15 matching lines @@
 
     {
         SkRecord record;
         SkRecorder recorder(&record, 10, 10);
         recorder.drawImageRect(image, 0, SkRect::MakeWH(10, 10));
         SkRecordDraw(record, &canvas, NULL, NULL, 0, NULL, 0);
     }
     REPORTER_ASSERT(r, canvas.fDrawImageRectCalled);
 
 }