Rename paint data structures

cc/playback/display_item.h

Index: cc/playback/display_item.h
diff --git a/cc/playback/display_item.h b/cc/playback/display_item.h
index a57096213813ba41c49492962451411e6175451f..ae7043dfc7fd6aba68dfdd83f12987e0710d5cde 100644
--- a/cc/playback/display_item.h
+++ b/cc/playback/display_item.h
@@ -11,11 +11,10 @@
 
 #include "cc/base/cc_export.h"
 #include "cc/debug/traced_value.h"
-#include "third_party/skia/include/core/SkPicture.h"
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_record.h"
 #include "ui/gfx/geometry/rect.h"
 
-class SkCanvas;
-
 namespace cc {
 
 class CC_EXPORT DisplayItem {
@@ -38,9 +37,10 @@ class CC_EXPORT DisplayItem {
 
   virtual ~DisplayItem() {}
 
-  virtual sk_sp<const SkPicture> GetPicture() const;
-  virtual void Raster(SkCanvas* canvas,
-                      SkPicture::AbortCallback* callback) const = 0;
+  // TODO(enne): rename this to PaintRecord
+  virtual sk_sp<const PaintRecord> GetPicture() const;
+  virtual void Raster(PaintCanvas* canvas,
+                      PaintRecord::AbortCallback* callback) const = 0;
   virtual void AsValueInto(const gfx::Rect& visual_rect,
                            base::trace_event::TracedValue* array) const = 0;