use new onDrawPicture variant, as the previous is now deprecated and is no...

use new onDrawPicture variant, as the previous is now deprecated and is no longer called by the base-class.

TBR=fmalita@chromium.org

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

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

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

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

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

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

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

@@ -71,7 +71,6 @@ 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*);
     virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*);
     virtual void didSetMatrix(const SkMatrix&) OVERRIDE;
     virtual void didConcat(const SkMatrix&) OVERRIDE;

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

@@ -239,12 +239,6 @@ void ProfilingCanvas::onClipRegion(const SkRegion& region, SkRegion::Op op)
     this->SkCanvas::onClipRegion(region, op);
 }
 
-void ProfilingCanvas::onDrawPicture(const SkPicture* picture)
-{
-    AutoStamper stamper(this);
-    this->SkCanvas::onDrawPicture(picture);
-}
-
 void ProfilingCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint)
 {
     AutoStamper stamper(this);

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

@@ -71,7 +71,6 @@ 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*);
     virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*);
     virtual void didSetMatrix(const SkMatrix&) OVERRIDE;
     virtual void didConcat(const SkMatrix&) OVERRIDE;

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

@@ -253,12 +253,6 @@ void ReplayingCanvas::onClipRegion(const SkRegion& region, SkRegion::Op op)
     this->SkCanvas::onClipRegion(region, op);
 }
 
-void ReplayingCanvas::onDrawPicture(const SkPicture* picture)
-{
-    AutoReplayer replayer(this);
-    this->SkCanvas::onDrawPicture(picture);
-}
-
 void ReplayingCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint)
 {
     AutoReplayer replayer(this);

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

@@ -73,7 +73,6 @@ 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*);
     virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*);
     virtual void didSetMatrix(const SkMatrix&) OVERRIDE;
     virtual void didConcat(const SkMatrix&) OVERRIDE;