Remove SK_LEGACY_DRAWPICTURECALLBACK

SkDrawPictureCallback is deprecated. Convert existing clients to the
equivalent SkPicture::AbortCallback.

R=reed@google.com,enne@chromium.org,danakj@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#330935}

1 files changed, 4 insertions, 3 deletions

diff --git a/cc/playback/compositing_display_item.h b/cc/playback/compositing_display_item.h
index d2af8d5..78359e6 100644
--- a/cc/playback/compositing_display_item.h
+++ b/cc/playback/compositing_display_item.h
@@ -15,7 +15,6 @@
 #include "ui/gfx/geometry/rect_f.h"
 
 class SkCanvas;
-class SkDrawPictureCallback;
 
 namespace cc {
 
@@ -29,7 +28,8 @@ class CC_EXPORT CompositingDisplayItem : public DisplayItem {
               SkRect* bounds,
               skia::RefPtr<SkColorFilter> color_filter);
 
-  void Raster(SkCanvas* canvas, SkDrawPictureCallback* callback) const override;
+  void Raster(SkCanvas* canvas,
+              SkPicture::AbortCallback* callback) const override;
   void AsValueInto(base::trace_event::TracedValue* array) const override;
 
  private:
@@ -49,7 +49,8 @@ class CC_EXPORT EndCompositingDisplayItem : public DisplayItem {
     return make_scoped_ptr(new EndCompositingDisplayItem());
   }
 
-  void Raster(SkCanvas* canvas, SkDrawPictureCallback* callback) const override;
+  void Raster(SkCanvas* canvas,
+              SkPicture::AbortCallback* callback) const override;
   void AsValueInto(base::trace_event::TracedValue* array) const override;
 };