Update from https://crrev.com/311076

skia/ext/benchmarking_canvas.cc

Index: skia/ext/benchmarking_canvas.cc
diff --git a/skia/ext/benchmarking_canvas.cc b/skia/ext/benchmarking_canvas.cc
index b2bc0d02cce9965aa5d6fb23b215e1c7e75a29b6..5e0032706cf14f2f0facf7101150e1d693900fe4 100644
--- a/skia/ext/benchmarking_canvas.cc
+++ b/skia/ext/benchmarking_canvas.cc
@@ -57,81 +57,76 @@ public:
     SkProxyCanvas::willRestore();
   }
 
-  void drawPaint(const SkPaint& paint) override {
+  void onDrawPaint(const SkPaint& paint) override {
     AutoStamper stamper(this);
-    SkProxyCanvas::drawPaint(paint);
+    SkProxyCanvas::onDrawPaint(paint);
   }
 
-  void drawPoints(PointMode mode,
-                  size_t count,
-                  const SkPoint pts[],
-                  const SkPaint& paint) override {
-    AutoStamper stamper(this);
-    SkProxyCanvas::drawPoints(mode, count, pts, paint);
-  }
-
-  void drawOval(const SkRect& rect, const SkPaint& paint) override {
+  void onDrawPoints(PointMode mode,
+                    size_t count,
+                    const SkPoint pts[],
+                    const SkPaint& paint) override {
     AutoStamper stamper(this);
-    SkProxyCanvas::drawOval(rect, paint);
+    SkProxyCanvas::onDrawPoints(mode, count, pts, paint);
   }
 
-  void drawRect(const SkRect& rect, const SkPaint& paint) override {
+  void onDrawOval(const SkRect& rect, const SkPaint& paint) override {
     AutoStamper stamper(this);
-    SkProxyCanvas::drawRect(rect, paint);
+    SkProxyCanvas::onDrawOval(rect, paint);
   }
 
-  void drawRRect(const SkRRect& rrect, const SkPaint& paint) override {
+  void onDrawRect(const SkRect& rect, const SkPaint& paint) override {
     AutoStamper stamper(this);
-    SkProxyCanvas::drawRRect(rrect, paint);
+    SkProxyCanvas::onDrawRect(rect, paint);
   }
 
-  void drawPath(const SkPath& path, const SkPaint& paint) override {
+  void onDrawRRect(const SkRRect& rrect, const SkPaint& paint) override {
     AutoStamper stamper(this);
-    SkProxyCanvas::drawPath(path, paint);
+    SkProxyCanvas::onDrawRRect(rrect, paint);
   }
 
-  void drawBitmap(const SkBitmap& bitmap,
-                  SkScalar left,
-                  SkScalar top,
-                  const SkPaint* paint = NULL) override {
+  void onDrawPath(const SkPath& path, const SkPaint& paint) override {
     AutoStamper stamper(this);
-    SkProxyCanvas::drawBitmap(bitmap, left, top, paint);
+    SkProxyCanvas::onDrawPath(path, paint);
   }
 
-  void drawBitmapRectToRect(const SkBitmap& bitmap,
-                            const SkRect* src,
-                            const SkRect& dst,
-                            const SkPaint* paint,
-                            DrawBitmapRectFlags flags) override {
+  void onDrawBitmap(const SkBitmap& bitmap,
+                    SkScalar left,
+                    SkScalar top,
+                    const SkPaint* paint) override {
     AutoStamper stamper(this);
-    SkProxyCanvas::drawBitmapRectToRect(bitmap, src, dst, paint, flags);
+    SkProxyCanvas::onDrawBitmap(bitmap, left, top, paint);
   }
 
-  void drawSprite(const SkBitmap& bitmap,
-                  int left,
-                  int top,
-                  const SkPaint* paint = NULL) override {
+  void onDrawBitmapRect(const SkBitmap& bitmap,
+                        const SkRect* src,
+                        const SkRect& dst,
+                        const SkPaint* paint,
+                        DrawBitmapRectFlags flags) override {
     AutoStamper stamper(this);
-    SkProxyCanvas::drawSprite(bitmap, left, top, paint);
+    SkProxyCanvas::onDrawBitmapRect(bitmap, src, dst, paint, flags);
   }
 
-  void 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) override {
+  void onDrawSprite(const SkBitmap& bitmap,
+                    int left,
+                    int top,
+                    const SkPaint* paint) override {
     AutoStamper stamper(this);
-    SkProxyCanvas::drawVertices(vmode, vertexCount, vertices, texs, colors,
-                                xmode, indices, indexCount, paint);
+    SkProxyCanvas::onDrawSprite(bitmap, left, top, paint);
   }
 
-  void drawData(const void* data, size_t length) override {
+  void 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) override {
     AutoStamper stamper(this);
-    SkProxyCanvas::drawData(data, length);
+    SkProxyCanvas::onDrawVertices(vmode, vertexCount, vertices, texs, colors,
+                                  xmode, indices, indexCount, paint);
   }
 
 protected: