preemptive add new virtual for onDrawPicture

skia is changing the signature for onDrawPicture, so this CL adds the new one, and removes OVERRIDE from the old.

BUG=

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

git-svn-id: svn://svn.chromium.org/blink/trunk@179885 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp

@@ -355,6 +355,13 @@ void LoggingCanvas::onDrawPicture(const SkPicture* picture)
     this->SkCanvas::onDrawPicture(picture);
 }
 
+void LoggingCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint)
+{
+    AutoLogger logger(this);
+    logger.logItemWithParams("drawPicture")->setObject("picture", objectForSkPicture(*picture));
+    this->SkCanvas::onDrawPicture(picture, matrix, paint);
+}
+
 void LoggingCanvas::didSetMatrix(const SkMatrix& matrix)
 {
     AutoLogger logger(this);

third_party/WebKit/Source/platform/graphics/LoggingCanvas.h

@@ -71,7 +71,8 @@ public:
     virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) OVERRIDE;
     virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) OVERRIDE;
     virtual void onClipRegion(const SkRegion&, SkRegion::Op) OVERRIDE;
-    virtual void onDrawPicture(const SkPicture*) OVERRIDE;
+    virtual void onDrawPicture(const SkPicture*);
+    virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*);
     virtual void didSetMatrix(const SkMatrix&) OVERRIDE;
     virtual void didConcat(const SkMatrix&) OVERRIDE;
     virtual void willSave() OVERRIDE;

third_party/WebKit/Source/platform/graphics/ProfilingCanvas.cpp

@@ -245,6 +245,12 @@ void ProfilingCanvas::onDrawPicture(const SkPicture* picture)
     this->SkCanvas::onDrawPicture(picture);
 }
 
+void ProfilingCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint)
+{
+    AutoStamper stamper(this);
+    this->SkCanvas::onDrawPicture(picture);
+}
+
 void ProfilingCanvas::didSetMatrix(const SkMatrix& matrix)
 {
     AutoStamper stamper(this);

third_party/WebKit/Source/platform/graphics/ProfilingCanvas.h

@@ -71,7 +71,8 @@ public:
     virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) OVERRIDE;
     virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) OVERRIDE;
     virtual void onClipRegion(const SkRegion&, SkRegion::Op) OVERRIDE;
-    virtual void onDrawPicture(const SkPicture*) OVERRIDE;
+    virtual void onDrawPicture(const SkPicture*);
+    virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*);
     virtual void didSetMatrix(const SkMatrix&) OVERRIDE;
     virtual void didConcat(const SkMatrix&) OVERRIDE;
     virtual void willSave() OVERRIDE;

third_party/WebKit/Source/platform/graphics/ReplayingCanvas.cpp

@@ -259,6 +259,12 @@ void ReplayingCanvas::onDrawPicture(const SkPicture* picture)
     this->SkCanvas::onDrawPicture(picture);
 }
 
+void ReplayingCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint)
+{
+    AutoReplayer replayer(this);
+    this->SkCanvas::onDrawPicture(picture, matrix, paint);
+}
+
 void ReplayingCanvas::didSetMatrix(const SkMatrix& matrix)
 {
     AutoReplayer replayer(this);

third_party/WebKit/Source/platform/graphics/ReplayingCanvas.h

@@ -73,7 +73,8 @@ public:
     virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) OVERRIDE;
     virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) OVERRIDE;
     virtual void onClipRegion(const SkRegion&, SkRegion::Op) OVERRIDE;
-    virtual void onDrawPicture(const SkPicture*) OVERRIDE;
+    virtual void onDrawPicture(const SkPicture*);
+    virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*);
     virtual void didSetMatrix(const SkMatrix&) OVERRIDE;
     virtual void didConcat(const SkMatrix&) OVERRIDE;
     virtual void willSave() OVERRIDE;