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 aad82535bfe7876b00476d44fe30c41e607ea8ec..8baa89ad782b1b8ae8465961b6bc30b8b5fbcab5 100644
--- a/cc/playback/drawing_display_item.h
+++ b/cc/playback/drawing_display_item.h
@@ -15,8 +15,8 @@
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "ui/gfx/geometry/point_f.h"
 
-class SkCanvas;
-class SkPicture;
+class PaintCanvas;
+class PaintRecord;
 
 namespace cc {
 class ClientPictureCache;
@@ -24,7 +24,7 @@ class ClientPictureCache;
 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 proto::DisplayItem& proto,
                               ClientPictureCache* client_picture_cache,
                               std::vector<uint32_t>* used_engine_picture_ids);
@@ -32,9 +32,9 @@ class CC_EXPORT DrawingDisplayItem : public DisplayItem {
   ~DrawingDisplayItem() override;
 
   void ToProtobuf(proto::DisplayItem* proto) const 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;
 
@@ -44,9 +44,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