Rename paint data structures

cc/playback/display_item_list.h

Index: cc/playback/display_item_list.h
diff --git a/cc/playback/display_item_list.h b/cc/playback/display_item_list.h
index d5b5e88f5aefbaafe60690cb7aaf97b42c433723..83a6550da52a4c21f4f17441a9f2b3c0d3faa406 100644
--- a/cc/playback/display_item_list.h
+++ b/cc/playback/display_item_list.h
@@ -17,16 +17,15 @@
 #include "cc/base/cc_export.h"
 #include "cc/base/contiguous_container.h"
 #include "cc/base/rtree.h"
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_record.h"
 #include "cc/playback/discardable_image_map.h"
 #include "cc/playback/display_item.h"
 #include "cc/playback/display_item_list_settings.h"
-#include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/color_space.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 
-class SkCanvas;
-
 namespace cc {
 class ClientPictureCache;
 class DisplayItem;
@@ -54,13 +53,12 @@ class CC_EXPORT DisplayItemList
   void ToProtobuf(proto::DisplayItemList* proto);
 
   // TODO(trchen): Deprecated. Apply clip and scale on the canvas instead.
-  void Raster(SkCanvas* canvas,
-              SkPicture::AbortCallback* callback,
+  void Raster(PaintCanvas* canvas,
+              PaintRecord::AbortCallback* callback,
               const gfx::Rect& canvas_target_playback_rect,
               float contents_scale) const;
 
-  void Raster(SkCanvas* canvas, SkPicture::AbortCallback* callback) const;
-
+  void Raster(PaintCanvas* canvas, PaintRecord::AbortCallback* callback) const;
 
   // Because processing happens in these CreateAndAppend functions, all the set
   // up for the item should be done via the args, which is why the return type
@@ -136,7 +134,7 @@ class CC_EXPORT DisplayItemList
   }
 
   // Called after all items are appended, to process the items and, if
-  // applicable, create an internally cached SkPicture.
+  // applicable, create an internally cached PaintRecord.
   void Finalize();
 
   void SetIsSuitableForGpuRasterization(bool is_suitable) {