update canvas drawtext virtuals

skia/ext/benchmarking_canvas.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "skia/ext/benchmarking_canvas.h"
 #include "third_party/skia/include/utils/SkProxyCanvas.h"
 
@@ skipping 96 matching lines @@
     AutoStamper stamper(this);
     SkProxyCanvas::drawBitmapMatrix(bitmap, m, paint);
   }
 
   virtual void drawSprite(const SkBitmap& bitmap, int left, int top,
                           const SkPaint* paint = NULL) OVERRIDE {
     AutoStamper stamper(this);
     SkProxyCanvas::drawSprite(bitmap, left, top, paint);
   }
 
-  virtual void drawText(const void* text, size_t byteLength, SkScalar x,
-                        SkScalar y, const SkPaint& paint) OVERRIDE {
-    AutoStamper stamper(this);
-    SkProxyCanvas::drawText(text, byteLength, x, y, paint);
-  }
-
-  virtual void drawPosText(const void* text, size_t byteLength,
-                           const SkPoint pos[],
-                           const SkPaint& paint) OVERRIDE {
-    AutoStamper stamper(this);
-    SkProxyCanvas::drawPosText(text, byteLength, pos, paint);
-  }
-
-  virtual void drawPosTextH(const void* text, size_t byteLength,
-                            const SkScalar xpos[], SkScalar constY,
-                            const SkPaint& paint) OVERRIDE {
-    AutoStamper stamper(this);
-    SkProxyCanvas::drawPosTextH(text, byteLength, xpos, constY, paint);
-  }
-
-  virtual void drawTextOnPath(const void* text, size_t byteLength,
-                              const SkPath& path, const SkMatrix* matrix,
-                              const SkPaint& paint) OVERRIDE {
-    AutoStamper stamper(this);
-    SkProxyCanvas::drawTextOnPath(text, byteLength, path, matrix, paint);
-  }
-
   virtual void drawPicture(SkPicture& picture) OVERRIDE {
     AutoStamper stamper(this);
     SkProxyCanvas::drawPicture(picture);
   }
 
   virtual 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 {
     AutoStamper stamper(this);
     SkProxyCanvas::drawVertices(vmode, vertexCount, vertices, texs, colors,
                                 xmode, indices, indexCount, paint);
   }
 
   virtual void drawData(const void* data, size_t length) OVERRIDE {
     AutoStamper stamper(this);
     SkProxyCanvas::drawData(data, length);
   }
 
 protected:
+  virtual void onDrawText(const void* text, size_t byteLength, SkScalar x,
+                          SkScalar y, const SkPaint& paint) OVERRIDE {
+    AutoStamper stamper(this);
+    SkProxyCanvas::onDrawText(text, byteLength, x, y, paint);
+  }
+
+  virtual void onDrawPosText(const void* text, size_t byteLength,
+                             const SkPoint pos[],
+                             const SkPaint& paint) OVERRIDE {
+    AutoStamper stamper(this);
+    SkProxyCanvas::onDrawPosText(text, byteLength, pos, paint);
+  }
+
+  virtual void onDrawPosTextH(const void* text, size_t byteLength,
+                              const SkScalar xpos[], SkScalar constY,
+                              const SkPaint& paint) OVERRIDE {
+    AutoStamper stamper(this);
+    SkProxyCanvas::onDrawPosTextH(text, byteLength, xpos, constY, paint);
+  }
+
+  virtual void onDrawTextOnPath(const void* text, size_t byteLength,
+                                const SkPath& path, const SkMatrix* matrix,
+                                const SkPaint& paint) OVERRIDE {
+    AutoStamper stamper(this);
+    SkProxyCanvas::onDrawTextOnPath(text, byteLength, path, matrix, paint);
+  }
+
   virtual void onClipRect(const SkRect& rect, SkRegion::Op op,
                           ClipEdgeStyle edge_style) OVERRIDE {
     AutoStamper stamper(this);
     SkProxyCanvas::onClipRect(rect, op, edge_style);
   }
 
   virtual void onClipRRect(const SkRRect& rrect, SkRegion::Op op,
                           ClipEdgeStyle edge_style) OVERRIDE {
     AutoStamper stamper(this);
     SkProxyCanvas::onClipRRect(rrect, op, edge_style);
@@ skipping 54 matching lines @@
   DCHECK_LT(index, static_cast<size_t>(debug_canvas_->getSize()));
   return debug_canvas_->getDrawCommandAt(index);
 }
 
 double BenchmarkingCanvas::GetTime(size_t index) {
   DCHECK_LT(index,  static_cast<size_t>(debug_canvas_->getSize()));
   return timing_canvas_->GetTime(index);
 }
 
 } // namespace skia