Update from https://crrev.com/311076

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/SkDrawPictureCallback.h"
@@ skipping 12 matching lines @@
   // Returns true when a SkColor can be used to represent result.
   bool GetColorIfSolid(SkColor* color) const;
 
   void SetForceNotSolid(bool flag);
   void SetForceNotTransparent(bool flag);
 
   // SkDrawPictureCallback override.
   bool abortDrawing() override;
 
   // SkCanvas overrides.
-  void drawPaint(const SkPaint& paint) override;
-  void drawPoints(PointMode,
+  void onDrawPaint(const SkPaint& paint) override;
+  void onDrawPoints(PointMode,
                   size_t count,
                   const SkPoint pts[],
                   const SkPaint&) override;
-  void drawOval(const SkRect&, const SkPaint&) override;
-  void drawRect(const SkRect&, const SkPaint&) override;
-  void drawRRect(const SkRRect&, const SkPaint&) override;
-  void drawPath(const SkPath& path, const SkPaint&) override;
-  void drawBitmap(const SkBitmap&,
-                  SkScalar left,
-                  SkScalar top,
-                  const SkPaint* paint = NULL) override;
-  void drawBitmapRectToRect(const SkBitmap&,
-                            const SkRect* src,
-                            const SkRect& dst,
-                            const SkPaint* paint,
-                            DrawBitmapRectFlags flags) override;
-  void drawBitmapNine(const SkBitmap& bitmap,
-                      const SkIRect& center,
-                      const SkRect& dst,
-                      const SkPaint* paint = NULL) override;
-  void drawSprite(const SkBitmap&,
-                  int left,
-                  int top,
-                  const SkPaint* paint = NULL) override;
-  void drawVertices(VertexMode,
-                    int vertexCount,
-                    const SkPoint vertices[],
-                    const SkPoint texs[],
-                    const SkColor colors[],
-                    SkXfermode*,
-                    const uint16_t indices[],
-                    int indexCount,
-                    const SkPaint&) override;
+  void onDrawOval(const SkRect&, const SkPaint&) override;
+  void onDrawRect(const SkRect&, const SkPaint&) override;
+  void onDrawRRect(const SkRRect&, const SkPaint&) override;
+  void onDrawPath(const SkPath& path, const SkPaint&) override;
+  void onDrawBitmap(const SkBitmap&,
+                    SkScalar left,
+                    SkScalar top,
+                    const SkPaint* paint = NULL) override;
+  void onDrawBitmapRect(const SkBitmap&,
+                        const SkRect* src,
+                        const SkRect& dst,
+                        const SkPaint* paint,
+                        DrawBitmapRectFlags flags) override;
+  void onDrawBitmapNine(const SkBitmap& bitmap,
+                        const SkIRect& center,
+                        const SkRect& dst,
+                        const SkPaint* paint = NULL) override;
+  void onDrawSprite(const SkBitmap&,
+                    int left,
+                    int top,
+                    const SkPaint* paint = NULL) override;
+  void onDrawVertices(VertexMode,
+                      int vertexCount,
+                      const SkPoint vertices[],
+                      const SkPoint texs[],
+                      const SkColor colors[],
+                      SkXfermode*,
+                      const uint16_t indices[],
+                      int indexCount,
+                      const SkPaint&) override;
 
  protected:
   void willSave() override;
   SaveLayerStrategy willSaveLayer(const SkRect*,
                                   const SkPaint*,
                                   SaveFlags) override;
   void willRestore() override;
 
   void onClipRect(const SkRect& rect,
                   SkRegion::Op op,
@@ skipping 47 matching lines @@
   bool is_solid_color_;
   SkColor color_;
   bool is_transparent_;
   int draw_op_count_;
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_ANALYSIS_CANVAS_H_