Chromium roll (https://codereview.chromium.org/976353002)

cc/resources/picture.cc

Index: cc/resources/picture.cc
diff --git a/cc/resources/picture.cc b/cc/resources/picture.cc
index cf5e59b0bababbb0eb557f5e5a1967b6329b9040..30c58455de41d3647e091456be4a07563ac88f02 100644
--- a/cc/resources/picture.cc
+++ b/cc/resources/picture.cc
@@ -287,7 +287,7 @@ void Picture::GatherPixelRefs(const gfx::Size& tile_grid_size) {
 }
 
 int Picture::Raster(SkCanvas* canvas,
-                    SkDrawPictureCallback* callback,
+                    SkPicture::AbortCallback* callback,
                     const Region& negated_content_region,
                     float contents_scale) const {
   TRACE_EVENT_BEGIN1(
@@ -323,10 +323,10 @@ int Picture::Raster(SkCanvas* canvas,
   return bounds.width() * bounds.height();
 }
 
-void Picture::Replay(SkCanvas* canvas) {
+void Picture::Replay(SkCanvas* canvas, SkPicture::AbortCallback* callback) {
   TRACE_EVENT_BEGIN0("cc", "Picture::Replay");
   DCHECK(picture_);
-  picture_->playback(canvas);
+  picture_->playback(canvas, callback);
   SkIRect bounds;
   canvas->getClipDeviceBounds(&bounds);
   TRACE_EVENT_END1("cc", "Picture::Replay",