Revert of move remaining virtual draw methods to onDraw

src/utils/SkProxyCanvas.cpp

Index: src/utils/SkProxyCanvas.cpp
diff --git a/src/utils/SkProxyCanvas.cpp b/src/utils/SkProxyCanvas.cpp
index ade4315f3d29a2d24614532d1a5b46126b746d74..161f3c0794559459b78e2b2ac0d8488d7fb3cc2c 100644
--- a/src/utils/SkProxyCanvas.cpp
+++ b/src/utils/SkProxyCanvas.cpp
@@ -65,24 +65,24 @@
     fProxy->clipRegion(deviceRgn, op);
 }
 
-void SkProxyCanvas::onDrawPaint(const SkPaint& paint) {
+void SkProxyCanvas::drawPaint(const SkPaint& paint) {
     fProxy->drawPaint(paint);
 }
 
-void SkProxyCanvas::onDrawPoints(PointMode mode, size_t count,
-                                 const SkPoint pts[], const SkPaint& paint) {
+void SkProxyCanvas::drawPoints(PointMode mode, size_t count,
+                               const SkPoint pts[], const SkPaint& paint) {
     fProxy->drawPoints(mode, count, pts, paint);
 }
 
-void SkProxyCanvas::onDrawOval(const SkRect& rect, const SkPaint& paint) {
+void SkProxyCanvas::drawOval(const SkRect& rect, const SkPaint& paint) {
     fProxy->drawOval(rect, paint);
 }
 
-void SkProxyCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) {
+void SkProxyCanvas::drawRect(const SkRect& rect, const SkPaint& paint) {
     fProxy->drawRect(rect, paint);
 }
 
-void SkProxyCanvas::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) {
+void SkProxyCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
     fProxy->drawRRect(rrect, paint);
 }
 
@@ -91,36 +91,34 @@
     fProxy->drawDRRect(outer, inner, paint);
 }
 
-void SkProxyCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
+void SkProxyCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
     fProxy->drawPath(path, paint);
 }
 
-void SkProxyCanvas::onDrawImage(const SkImage* image, SkScalar left, SkScalar top,
-                                const SkPaint* paint) {
+void SkProxyCanvas::drawImage(const SkImage* image, SkScalar left, SkScalar top,
+                       const SkPaint* paint) {
     fProxy->drawImage(image, left, top, paint);
 }
 
-void SkProxyCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
-                                    const SkPaint* paint) {
+void SkProxyCanvas::drawImageRect(const SkImage* image, const SkRect* src,
+                           const SkRect& dst,
+                           const SkPaint* paint) {
     fProxy->drawImageRect(image, src, dst, paint);
 }
 
-void SkProxyCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y,
-                                 const SkPaint* paint) {
+void SkProxyCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y,
+                               const SkPaint* paint) {
     fProxy->drawBitmap(bitmap, x, y, paint);
 }
 
-void SkProxyCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
-                                     const SkPaint* paint, DrawBitmapRectFlags flags) {
+void SkProxyCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
+                                   const SkRect& dst, const SkPaint* paint,
+                                   DrawBitmapRectFlags flags) {
     fProxy->drawBitmapRectToRect(bitmap, src, dst, paint, flags);
 }
 
-void SkProxyCanvas::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
-                                     const SkRect& dst, const SkPaint* paint) {
-    fProxy->drawBitmapNine(bitmap, center, dst, paint);
-}
-
-void SkProxyCanvas::onDrawSprite(const SkBitmap& bitmap, int x, int y, const SkPaint* paint) {
+void SkProxyCanvas::drawSprite(const SkBitmap& bitmap, int x, int y,
+                               const SkPaint* paint) {
     fProxy->drawSprite(bitmap, x, y, paint);
 }
 
@@ -154,11 +152,11 @@
     fProxy->drawPicture(picture, matrix, paint);
 }
 
-void SkProxyCanvas::onDrawVertices(VertexMode vmode, int vertexCount,
-                                   const SkPoint vertices[], const SkPoint texs[],
-                                   const SkColor colors[], SkXfermode* xmode,
-                                   const uint16_t indices[], int indexCount,
-                                   const SkPaint& paint) {
+void SkProxyCanvas::drawVertices(VertexMode vmode, int vertexCount,
+                                 const SkPoint vertices[], const SkPoint texs[],
+                                 const SkColor colors[], SkXfermode* xmode,
+                                 const uint16_t indices[], int indexCount,
+                                 const SkPaint& paint) {
     fProxy->drawVertices(vmode, vertexCount, vertices, texs, colors,
                                      xmode, indices, indexCount, paint);
 }