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}

cc/playback/clip_display_item.cc

@@ -33,7 +33,7 @@ void ClipDisplayItem::SetNew(gfx::Rect clip_rect,
 }
 
 void ClipDisplayItem::Raster(SkCanvas* canvas,
-                             SkDrawPictureCallback* callback) const {
+                             SkPicture::AbortCallback* callback) const {
   canvas->save();
   canvas->clipRect(SkRect::MakeXYWH(clip_rect_.x(), clip_rect_.y(),
                                     clip_rect_.width(), clip_rect_.height()));
@@ -83,7 +83,7 @@ EndClipDisplayItem::~EndClipDisplayItem() {
 }
 
 void EndClipDisplayItem::Raster(SkCanvas* canvas,
-                                SkDrawPictureCallback* callback) const {
+                                SkPicture::AbortCallback* callback) const {
   canvas->restore();
 }
 

cc/playback/clip_display_item.h

@@ -14,7 +14,6 @@
 #include "ui/gfx/geometry/rect.h"
 
 class SkCanvas;
-class SkDrawPictureCallback;
 
 namespace cc {
 
@@ -26,7 +25,8 @@ class CC_EXPORT ClipDisplayItem : public DisplayItem {
   void SetNew(gfx::Rect clip_rect,
               const std::vector<SkRRect>& rounded_clip_rects);
 
-  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:
@@ -39,7 +39,8 @@ class CC_EXPORT EndClipDisplayItem : public DisplayItem {
   EndClipDisplayItem();
   ~EndClipDisplayItem() override;
 
-  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;
 };
 

cc/playback/clip_path_display_item.cc

@@ -29,7 +29,7 @@ void ClipPathDisplayItem::SetNew(const SkPath& clip_path,
 }
 
 void ClipPathDisplayItem::Raster(SkCanvas* canvas,
-                                 SkDrawPictureCallback* callback) const {
+                                 SkPicture::AbortCallback* callback) const {
   canvas->save();
   canvas->clipPath(clip_path_, clip_op_, antialias_);
 }
@@ -49,7 +49,7 @@ EndClipPathDisplayItem::~EndClipPathDisplayItem() {
 }
 
 void EndClipPathDisplayItem::Raster(SkCanvas* canvas,
-                                    SkDrawPictureCallback* callback) const {
+                                    SkPicture::AbortCallback* callback) const {
   canvas->restore();
 }
 

cc/playback/clip_path_display_item.h

@@ -12,7 +12,6 @@
 #include "third_party/skia/include/core/SkRegion.h"
 
 class SkCanvas;
-class SkDrawPictureCallback;
 
 namespace cc {
 
@@ -23,7 +22,8 @@ class CC_EXPORT ClipPathDisplayItem : public DisplayItem {
 
   void SetNew(const SkPath& path, SkRegion::Op clip_op, bool antialias);
 
-  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:
@@ -41,7 +41,8 @@ class CC_EXPORT EndClipPathDisplayItem : public DisplayItem {
     return make_scoped_ptr(new EndClipPathDisplayItem());
   }
 
-  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;
 };
 

cc/playback/compositing_display_item.cc

@@ -38,7 +38,7 @@ void CompositingDisplayItem::SetNew(uint8_t alpha,
 }
 
 void CompositingDisplayItem::Raster(SkCanvas* canvas,
-                                    SkDrawPictureCallback* callback) const {
+                                    SkPicture::AbortCallback* callback) const {
   SkPaint paint;
   paint.setXfermodeMode(xfermode_);
   paint.setAlpha(alpha_);
@@ -65,8 +65,9 @@ EndCompositingDisplayItem::EndCompositingDisplayItem() {
 EndCompositingDisplayItem::~EndCompositingDisplayItem() {
 }
 
-void EndCompositingDisplayItem::Raster(SkCanvas* canvas,
-                                       SkDrawPictureCallback* callback) const {
+void EndCompositingDisplayItem::Raster(
+    SkCanvas* canvas,
+    SkPicture::AbortCallback* callback) const {
   canvas->restore();
 }
 

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;
 };
 

cc/playback/display_item.h

@@ -8,10 +8,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/debug/traced_value.h"
+#include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/geometry/rect.h"
 
 class SkCanvas;
-class SkDrawPictureCallback;
 
 namespace cc {
 
@@ -29,7 +29,7 @@ class CC_EXPORT DisplayItem {
   }
 
   virtual void Raster(SkCanvas* canvas,
-                      SkDrawPictureCallback* callback) const = 0;
+                      SkPicture::AbortCallback* callback) const = 0;
   virtual void AsValueInto(base::trace_event::TracedValue* array) const = 0;
 
   bool is_suitable_for_gpu_rasterization() const {

cc/playback/display_item_list.cc

@@ -14,7 +14,6 @@
 #include "cc/debug/traced_value.h"
 #include "cc/playback/largest_display_item.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkDrawPictureCallback.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/utils/SkPictureUtils.h"
 #include "ui/gfx/skia_util.h"
@@ -76,7 +75,7 @@ DisplayItemList::~DisplayItemList() {
 }
 
 void DisplayItemList::Raster(SkCanvas* canvas,
-                             SkDrawPictureCallback* callback,
+                             SkPicture::AbortCallback* callback,
                              float contents_scale) const {
   DCHECK(ProcessAppendedItemsCalled());
   if (!use_cached_picture_) {

cc/playback/display_item_list.h

@@ -20,7 +20,6 @@
 #include "ui/gfx/geometry/rect.h"
 
 class SkCanvas;
-class SkDrawPictureCallback;
 class SkPictureRecorder;
 
 namespace cc {
@@ -32,7 +31,7 @@ class CC_EXPORT DisplayItemList
                                                bool use_cached_picture);
 
   void Raster(SkCanvas* canvas,
-              SkDrawPictureCallback* callback,
+              SkPicture::AbortCallback* callback,
               float contents_scale) const;
 
   template <typename DisplayItemType>

cc/playback/display_list_raster_source.cc

@@ -107,7 +107,7 @@ void DisplayListRasterSource::PlaybackToCanvas(SkCanvas* canvas,
 }
 
 void DisplayListRasterSource::RasterCommon(SkCanvas* canvas,
-                                           SkDrawPictureCallback* callback,
+                                           SkPicture::AbortCallback* callback,
                                            const gfx::Rect& canvas_rect,
                                            float contents_scale) const {
   canvas->translate(-canvas_rect.x(), -canvas_rect.y());

cc/playback/display_list_raster_source.h

@@ -80,13 +80,13 @@ class CC_EXPORT DisplayListRasterSource : public RasterSource {
 
  private:
   // Called when analyzing a tile. We can use AnalysisCanvas as
-  // SkDrawPictureCallback, which allows us to early out from analysis.
+  // SkPicture::AbortCallback, which allows us to early out from analysis.
   void RasterForAnalysis(skia::AnalysisCanvas* canvas,
                          const gfx::Rect& canvas_rect,
                          float contents_scale) const;
 
   void RasterCommon(SkCanvas* canvas,
-                    SkDrawPictureCallback* callback,
+                    SkPicture::AbortCallback* callback,
                     const gfx::Rect& canvas_rect,
                     float contents_scale) const;
 

cc/playback/drawing_display_item.cc

@@ -10,7 +10,6 @@
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/debug/picture_debug_util.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkDrawPictureCallback.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/utils/SkPictureUtils.h"
@@ -31,7 +30,7 @@ void DrawingDisplayItem::SetNew(skia::RefPtr<SkPicture> picture) {
 }
 
 void DrawingDisplayItem::Raster(SkCanvas* canvas,
-                                SkDrawPictureCallback* callback) const {
+                                SkPicture::AbortCallback* callback) const {
   // SkPicture always does a wrapping save/restore on the canvas, so it is not
   // necessary here.
   if (callback)

cc/playback/drawing_display_item.h

@@ -12,7 +12,6 @@
 #include "ui/gfx/geometry/point_f.h"
 
 class SkCanvas;
-class SkDrawPictureCallback;
 class SkPicture;
 
 namespace cc {
@@ -24,7 +23,8 @@ class CC_EXPORT DrawingDisplayItem : public DisplayItem {
 
   void SetNew(skia::RefPtr<SkPicture> picture);
 
-  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;
 
   void CloneTo(DrawingDisplayItem* item) const;

cc/playback/filter_display_item.cc

@@ -34,7 +34,7 @@ void FilterDisplayItem::SetNew(const FilterOperations& filters,
 }
 
 void FilterDisplayItem::Raster(SkCanvas* canvas,
-                               SkDrawPictureCallback* callback) const {
+                               SkPicture::AbortCallback* callback) const {
   canvas->save();
   canvas->translate(bounds_.x(), bounds_.y());
 
@@ -68,7 +68,7 @@ EndFilterDisplayItem::~EndFilterDisplayItem() {
 }
 
 void EndFilterDisplayItem::Raster(SkCanvas* canvas,
-                                  SkDrawPictureCallback* callback) const {
+                                  SkPicture::AbortCallback* callback) const {
   canvas->restore();
   canvas->restore();
 }

cc/playback/filter_display_item.h

@@ -12,7 +12,6 @@
 #include "ui/gfx/geometry/rect_f.h"
 
 class SkCanvas;
-class SkDrawPictureCallback;
 
 namespace cc {
 
@@ -23,7 +22,8 @@ class CC_EXPORT FilterDisplayItem : public DisplayItem {
 
   void SetNew(const FilterOperations& filters, const gfx::RectF& bounds);
 
-  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:
@@ -40,7 +40,8 @@ class CC_EXPORT EndFilterDisplayItem : public DisplayItem {
     return make_scoped_ptr(new EndFilterDisplayItem());
   }
 
-  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;
 };
 

cc/playback/float_clip_display_item.cc

@@ -26,7 +26,7 @@ void FloatClipDisplayItem::SetNew(const gfx::RectF& clip_rect) {
 }
 
 void FloatClipDisplayItem::Raster(SkCanvas* canvas,
-                                  SkDrawPictureCallback* callback) const {
+                                  SkPicture::AbortCallback* callback) const {
   canvas->save();
   canvas->clipRect(gfx::RectFToSkRect(clip_rect_));
 }
@@ -46,7 +46,7 @@ EndFloatClipDisplayItem::~EndFloatClipDisplayItem() {
 }
 
 void EndFloatClipDisplayItem::Raster(SkCanvas* canvas,
-                                     SkDrawPictureCallback* callback) const {
+                                     SkPicture::AbortCallback* callback) const {
   canvas->restore();
 }
 

cc/playback/float_clip_display_item.h

@@ -13,7 +13,6 @@
 #include "ui/gfx/geometry/rect_f.h"
 
 class SkCanvas;
-class SkDrawPictureCallback;
 
 namespace cc {
 
@@ -24,7 +23,8 @@ class CC_EXPORT FloatClipDisplayItem : public DisplayItem {
 
   void SetNew(const gfx::RectF& clip_rect);
 
-  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:
@@ -40,7 +40,8 @@ class CC_EXPORT EndFloatClipDisplayItem : public DisplayItem {
     return make_scoped_ptr(new EndFloatClipDisplayItem());
   }
 
-  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;
 };
 

cc/playback/picture.cc

@@ -19,7 +19,6 @@
 #include "cc/layers/content_layer_client.h"
 #include "skia/ext/pixel_ref_utils.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkDrawPictureCallback.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/core/SkStream.h"

cc/playback/picture_pile_impl.cc

@@ -202,7 +202,7 @@ void PicturePileImpl::CoalesceRasters(const gfx::Rect& canvas_rect,
 }
 
 void PicturePileImpl::RasterCommon(SkCanvas* canvas,
-                                   SkDrawPictureCallback* callback,
+                                   SkPicture::AbortCallback* callback,
                                    const gfx::Rect& canvas_rect,
                                    float contents_scale) const {
   DCHECK(contents_scale >= min_contents_scale_);

cc/playback/picture_pile_impl.h

@@ -130,7 +130,7 @@ class CC_EXPORT PicturePileImpl : public RasterSource {
   typedef std::map<const Picture*, Region> PictureRegionMap;
 
   // Called when analyzing a tile. We can use AnalysisCanvas as
-  // SkDrawPictureCallback, which allows us to early out from analysis.
+  // SkPicture::AbortCallback, which allows us to early out from analysis.
   void RasterForAnalysis(skia::AnalysisCanvas* canvas,
                          const gfx::Rect& canvas_rect,
                          float contents_scale) const;
@@ -141,7 +141,7 @@ class CC_EXPORT PicturePileImpl : public RasterSource {
                        PictureRegionMap* result) const;
 
   void RasterCommon(SkCanvas* canvas,
-                    SkDrawPictureCallback* callback,
+                    SkPicture::AbortCallback* callback,
                     const gfx::Rect& canvas_rect,
                     float contents_scale) const;
 

cc/playback/transform_display_item.cc

@@ -26,7 +26,7 @@ void TransformDisplayItem::SetNew(const gfx::Transform& transform) {
 }
 
 void TransformDisplayItem::Raster(SkCanvas* canvas,
-                                  SkDrawPictureCallback* callback) const {
+                                  SkPicture::AbortCallback* callback) const {
   canvas->save();
   if (!transform_.IsIdentity())
     canvas->concat(transform_.matrix());
@@ -47,7 +47,7 @@ EndTransformDisplayItem::~EndTransformDisplayItem() {
 }
 
 void EndTransformDisplayItem::Raster(SkCanvas* canvas,
-                                     SkDrawPictureCallback* callback) const {
+                                     SkPicture::AbortCallback* callback) const {
   canvas->restore();
 }
 

cc/playback/transform_display_item.h

@@ -11,7 +11,6 @@
 #include "ui/gfx/transform.h"
 
 class SkCanvas;
-class SkDrawPictureCallback;
 
 namespace cc {
 
@@ -22,7 +21,8 @@ class CC_EXPORT TransformDisplayItem : public DisplayItem {
 
   void SetNew(const gfx::Transform& transform);
 
-  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:
@@ -38,7 +38,8 @@ class CC_EXPORT EndTransformDisplayItem : public DisplayItem {
     return make_scoped_ptr(new EndTransformDisplayItem());
   }
 
-  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;
 };
 

skia/config/SkUserConfig.h

@@ -249,10 +249,6 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
 #   define SK_SUPPORT_LEGACY_IMAGEFILTER_CTM
 #endif
 
-#ifndef    SK_LEGACY_DRAWPICTURECALLBACK
-#   define SK_LEGACY_DRAWPICTURECALLBACK
-#endif
-
 #ifndef    SK_SUPPORT_LEGACY_GETDEVICE
 #   define SK_SUPPORT_LEGACY_GETDEVICE
 #endif

skia/ext/analysis_canvas.cc

@@ -351,7 +351,7 @@ bool AnalysisCanvas::GetColorIfSolid(SkColor* color) const {
   return false;
 }
 
-bool AnalysisCanvas::abortDrawing() {
+bool AnalysisCanvas::abort() {
   // Early out as soon as we have more than one draw op.
   // TODO(vmpstr): Investigate if 1 is the correct metric here. We need to
   // balance the amount of time we spend analyzing vs how many tiles would be

skia/ext/analysis_canvas.h

@@ -7,7 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkDrawPictureCallback.h"
+#include "third_party/skia/include/core/SkPicture.h"
 
 namespace skia {
 
@@ -15,7 +15,7 @@ namespace skia {
 // (specified as a clip rectangle) of an SkPicture as the picture is
 // played back through it.
 // To use: play a picture into the canvas, and then check result.
-class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback {
+class SK_API AnalysisCanvas : public SkCanvas, public SkPicture::AbortCallback {
  public:
   AnalysisCanvas(int width, int height);
   ~AnalysisCanvas() override;
@@ -26,8 +26,8 @@ class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback {
   void SetForceNotSolid(bool flag);
   void SetForceNotTransparent(bool flag);
 
-  // SkDrawPictureCallback override.
-  bool abortDrawing() override;
+  // SkPicture::AbortCallback override.
+  bool abort() override;
 
   // SkCanvas overrides.
   void onDrawPaint(const SkPaint& paint) override;

skia/ext/analysis_canvas_unittest.cc

@@ -358,7 +358,7 @@ TEST(AnalysisCanvasTest, EarlyOutNotSolid) {
   EXPECT_FALSE(canvas.GetColorIfSolid(&output_color));
 
   // Verify that we aborted drawing.
-  EXPECT_TRUE(canvas.abortDrawing());
+  EXPECT_TRUE(canvas.abort());
 }
 
 TEST(AnalysisCanvasTest, ClipComplexRegion) {