commit d753acab6b69427e0ff94110394be76c94f15913
author James Robinson <jamesr@chromium.org> Mon Jan 12 13:07:20 2015 -0800
committer James Robinson <jamesr@chromium.org> Mon Jan 12 13:07:20 2015 -0800
tree 514874544df6d8ca3d323388d4d73a72ce0b8afe
parent 05abc8078efc954a35ca21d8ffcc13ab88d3de7e

Update from https://crrev.com/311076

Includes updating DCHECK_IS_ON to a function-style macro and removing
various dead skia-overriding code from Sky.

Review URL: https://codereview.chromium.org/851503003

skia/ext/analysis_canvas.h

diff --git a/skia/ext/analysis_canvas.h b/skia/ext/analysis_canvas.h
index 66186c0..6af139f 100644
--- a/skia/ext/analysis_canvas.h
+++ b/skia/ext/analysis_canvas.h
@@ -30,41 +30,41 @@
   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;