update canvas drawtext virtuals

skia/ext/analysis_canvas.h

 // 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.
 
 #ifndef SKIA_EXT_ANALYSIS_CANVAS_H_
 #define SKIA_EXT_ANALYSIS_CANVAS_H_
 
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
@@ skipping 41 matching lines @@
                                     DrawBitmapRectFlags flags) OVERRIDE;
   virtual void drawBitmapMatrix(const SkBitmap&,
                                 const SkMatrix&,
                                 const SkPaint* paint = NULL) OVERRIDE;
   virtual void drawBitmapNine(const SkBitmap& bitmap,
                               const SkIRect& center,
                               const SkRect& dst,
                               const SkPaint* paint = NULL) OVERRIDE;
   virtual void drawSprite(const SkBitmap&, int left, int top,
                           const SkPaint* paint = NULL) OVERRIDE;
-  virtual void drawText(const void* text,
-                        size_t byteLength,
-                        SkScalar x,
-                        SkScalar y,
-                        const SkPaint&) OVERRIDE;
-  virtual void drawPosText(const void* text,
-                           size_t byteLength,
-                           const SkPoint pos[],
-                           const SkPaint&) OVERRIDE;
-  virtual void drawPosTextH(const void* text,
-                            size_t byteLength,
-                            const SkScalar xpos[],
-                            SkScalar constY,
-                            const SkPaint&) OVERRIDE;
-  virtual void drawTextOnPath(const void* text,
-                              size_t byteLength,
-                              const SkPath& path,
-                              const SkMatrix* matrix,
-                              const SkPaint&) OVERRIDE;
   virtual void drawVertices(VertexMode,
                             int vertexCount,
                             const SkPoint vertices[],
                             const SkPoint texs[],
                             const SkColor colors[],
                             SkXfermode*,
                             const uint16_t indices[],
                             int indexCount,
                             const SkPaint&) OVERRIDE;
 
  protected:
   virtual void willSave(SaveFlags) OVERRIDE;
   virtual SaveLayerStrategy willSaveLayer(const SkRect*,
                                           const SkPaint*,
                                           SaveFlags) OVERRIDE;
   virtual void willRestore() OVERRIDE;
 
   virtual void onClipRect(const SkRect& rect,
                           SkRegion::Op op,
                           ClipEdgeStyle edge_style) OVERRIDE;
   virtual void onClipRRect(const SkRRect& rrect,
                            SkRegion::Op op,
                            ClipEdgeStyle edge_style) OVERRIDE;
   virtual void onClipPath(const SkPath& path,
                           SkRegion::Op op,
                           ClipEdgeStyle edge_style) OVERRIDE;
 
- private:
+  virtual void onDrawText(const void* text,
+                          size_t byteLength,
+                          SkScalar x,
+                          SkScalar y,
+                          const SkPaint&) OVERRIDE;
+  virtual void onDrawPosText(const void* text,
+                             size_t byteLength,
+                             const SkPoint pos[],
+                             const SkPaint&) OVERRIDE;
+  virtual void onDrawPosTextH(const void* text,
+                              size_t byteLength,
+                              const SkScalar xpos[],
+                              SkScalar constY,
+                              const SkPaint&) OVERRIDE;
+  virtual void onDrawTextOnPath(const void* text,
+                                size_t byteLength,
+                                const SkPath& path,
+                                const SkMatrix* matrix,
+                                const SkPaint&) OVERRIDE;
+
+private:
   typedef SkCanvas INHERITED;
 
   int saved_stack_size_;
   int force_not_solid_stack_level_;
   int force_not_transparent_stack_level_;
 
   bool is_forced_not_solid_;
   bool is_forced_not_transparent_;
   bool is_solid_color_;
   SkColor color_;
   bool is_transparent_;
   bool has_text_;
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_ANALYSIS_CANVAS_H_