Rename paint data structures

cc/playback/drawing_display_item.h

Index: cc/playback/drawing_display_item.h
diff --git a/cc/playback/drawing_display_item.h b/cc/playback/drawing_display_item.h
index 4885014e3d50e4846b28ad84aca747bd3bf6b5e9..803582a7e32dc24a482a186c3e55841d66647656 100644
--- a/cc/playback/drawing_display_item.h
+++ b/cc/playback/drawing_display_item.h
@@ -15,21 +15,18 @@
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "ui/gfx/geometry/point_f.h"
 
-class SkCanvas;
-class SkPicture;
-
 namespace cc {
 
 class CC_EXPORT DrawingDisplayItem : public DisplayItem {
  public:
   DrawingDisplayItem();
-  explicit DrawingDisplayItem(sk_sp<const SkPicture> picture);
+  explicit DrawingDisplayItem(sk_sp<const PaintRecord> picture);
   explicit DrawingDisplayItem(const DrawingDisplayItem& item);
   ~DrawingDisplayItem() override;
 
-  sk_sp<const SkPicture> GetPicture() const override;
-  void Raster(SkCanvas* canvas,
-              SkPicture::AbortCallback* callback) const override;
+  sk_sp<const PaintRecord> GetPicture() const override;
+  void Raster(PaintCanvas* canvas,
+              PaintRecord::AbortCallback* callback) const override;
   void AsValueInto(const gfx::Rect& visual_rect,
                    base::trace_event::TracedValue* array) const override;
 
@@ -39,9 +36,9 @@ class CC_EXPORT DrawingDisplayItem : public DisplayItem {
   void CloneTo(DrawingDisplayItem* item) const;
 
  private:
-  void SetNew(sk_sp<const SkPicture> picture);
+  void SetNew(sk_sp<const PaintRecord> picture);
 
-  sk_sp<const SkPicture> picture_;
+  sk_sp<const PaintRecord> picture_;
 };
 
 }  // namespace cc