Revert of move remaining virtual draw methods to onDraw

tests/TileGridTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkPictureRecorder.h"
 #include "SkTileGrid.h"
 #include "Test.h"
 
 enum Tile {
     kTopLeft_Tile = 0x1,
     kTopRight_Tile = 0x2,
     kBottomLeft_Tile = 0x4,
     kBottomRight_Tile = 0x8,
 
     kAll_Tile = kTopLeft_Tile | kTopRight_Tile | kBottomLeft_Tile | kBottomRight_Tile,
 };
 
 class MockCanvas : public SkCanvas {
 public:
     MockCanvas(const SkBitmap& bm) : SkCanvas(bm) {}
 
-    void onDrawRect(const SkRect& rect, const SkPaint&) SK_OVERRIDE {
+    virtual void drawRect(const SkRect& rect, const SkPaint&) {
         // This capture occurs before quick reject.
         fRects.push(rect);
     }
 
     SkTDArray<SkRect> fRects;
 };
 
 static void verify_tile_hits(skiatest::Reporter* reporter, SkRect rect,
                              uint32_t tileMask, int borderPixels = 0) {
     SkTileGridFactory::TileGridInfo info;
@@ skipping 208 matching lines @@
     verify_tile_hits(reporter, SkRect::MakeXYWH(9, 9, 1, 1),   kAll_Tile,         1);
     verify_tile_hits(reporter, SkRect::MakeXYWH(10, 10, 1, 1), kBottomRight_Tile, 1);
     verify_tile_hits(reporter, SkRect::MakeXYWH(17, 17, 1, 1), kBottomRight_Tile, 1);
 
     // BBoxes that overlap tiles
     verify_tile_hits(reporter, SkRect::MakeXYWH(5, 5, 10, 1),     kTopLeft_Tile | kTopRight_Tile);
     verify_tile_hits(reporter, SkRect::MakeXYWH(5, 5, 1, 10),     kTopLeft_Tile | kBottomLeft_Tile);
     verify_tile_hits(reporter, SkRect::MakeXYWH(5, 5, 10, 10),    kAll_Tile);
     verify_tile_hits(reporter, SkRect::MakeXYWH(-10, -10, 40, 40),kAll_Tile);
 }