Roll Skia DEPS to 14324 from 14292

Control: https://codereview.chromium.org/246073010

NOTRY=true
R=reed@google.com, robertphillips@google.com

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265696 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 77 insertions, 67 deletions

diff --git a/skia/ext/analysis_canvas.cc b/skia/ext/analysis_canvas.cc
index 524fd18..15ec6d8 100644
--- a/skia/ext/analysis_canvas.cc
+++ b/skia/ext/analysis_canvas.cc
@@ -214,40 +214,40 @@ void AnalysisCanvas::drawSprite(const SkBitmap& bitmap,
   is_transparent_ = false;
 }
 
-void AnalysisCanvas::drawText(const void* text,
-                              size_t len,
-                              SkScalar x,
-                              SkScalar y,
-                              const SkPaint& paint) {
+void AnalysisCanvas::onDrawText(const void* text,
+                                size_t len,
+                                SkScalar x,
+                                SkScalar y,
+                                const SkPaint& paint) {
   is_solid_color_ = false;
   is_transparent_ = false;
   has_text_ = true;
 }
 
-void AnalysisCanvas::drawPosText(const void* text,
-                                 size_t byteLength,
-                                 const SkPoint pos[],
-                                 const SkPaint& paint) {
+void AnalysisCanvas::onDrawPosText(const void* text,
+                                   size_t byteLength,
+                                   const SkPoint pos[],
+                                   const SkPaint& paint) {
   is_solid_color_ = false;
   is_transparent_ = false;
   has_text_ = true;
 }
 
-void AnalysisCanvas::drawPosTextH(const void* text,
-                                  size_t byteLength,
-                                  const SkScalar xpos[],
-                                  SkScalar constY,
-                                  const SkPaint& paint) {
+void AnalysisCanvas::onDrawPosTextH(const void* text,
+                                    size_t byteLength,
+                                    const SkScalar xpos[],
+                                    SkScalar constY,
+                                    const SkPaint& paint) {
   is_solid_color_ = false;
   is_transparent_ = false;
   has_text_ = true;
 }
 
-void AnalysisCanvas::drawTextOnPath(const void* text,
-                                    size_t len,
-                                    const SkPath& path,
-                                    const SkMatrix* matrix,
-                                    const SkPaint& paint) {
+void AnalysisCanvas::onDrawTextOnPath(const void* text,
+                                      size_t len,
+                                      const SkPath& path,
+                                      const SkMatrix* matrix,
+                                      const SkPaint& paint) {
   is_solid_color_ = false;
   is_transparent_ = false;
   has_text_ = true;
diff --git a/skia/ext/analysis_canvas.h b/skia/ext/analysis_canvas.h
index 922a3ee..efe9314 100644
--- a/skia/ext/analysis_canvas.h
+++ b/skia/ext/analysis_canvas.h
@@ -59,25 +59,6 @@ class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback {
                               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[],
@@ -105,7 +86,27 @@ class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback {
                           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_;
diff --git a/skia/ext/benchmarking_canvas.cc b/skia/ext/benchmarking_canvas.cc
index ec2ff3c..f765cd1 100644
--- a/skia/ext/benchmarking_canvas.cc
+++ b/skia/ext/benchmarking_canvas.cc
@@ -114,33 +114,6 @@ public:
     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);
@@ -162,6 +135,33 @@ public:
   }
 
 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);
diff --git a/skia/ext/pixel_ref_utils_unittest.cc b/skia/ext/pixel_ref_utils_unittest.cc
index 4d4ffbea..8ff3272 100644
--- a/skia/ext/pixel_ref_utils_unittest.cc
+++ b/skia/ext/pixel_ref_utils_unittest.cc
@@ -51,7 +51,16 @@ class TestDiscardableShader : public SkShader {
   }
 
   // Pure virtual implementaiton.
-  virtual void shadeSpan(int x, int y, SkPMColor[], int count) OVERRIDE {}
+  virtual SkShader::Context* createContext(const SkBitmap& device,
+                                           const SkPaint& paint,
+                                           const SkMatrix& matrix,
+                                           void* storage) const OVERRIDE {
+    return NULL;
+  };
+  virtual size_t contextSize() const OVERRIDE {
+    return sizeof(SkShader::Context);
+  }
+
   SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(TestDiscardableShader);
 
  private: