Rename paint data structures

cc/playback/drawing_display_item.cc

Index: cc/playback/drawing_display_item.cc
diff --git a/cc/playback/drawing_display_item.cc b/cc/playback/drawing_display_item.cc
index 15700830a58266573547c83e7e6e65dd6adfaa3c..1199391d2b542cf6df48b7bf7f98725d0b705826 100644
--- a/cc/playback/drawing_display_item.cc
+++ b/cc/playback/drawing_display_item.cc
@@ -13,19 +13,16 @@
 #include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
 #include "cc/debug/picture_debug_util.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkMatrix.h"
-#include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkStream.h"
-#include "third_party/skia/include/utils/SkPictureUtils.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 
 DrawingDisplayItem::DrawingDisplayItem() : DisplayItem(DRAWING) {}
 
-DrawingDisplayItem::DrawingDisplayItem(sk_sp<const SkPicture> picture)
+DrawingDisplayItem::DrawingDisplayItem(sk_sp<const PaintRecord> picture)
     : DisplayItem(DRAWING) {
   SetNew(std::move(picture));
 }
@@ -38,21 +35,21 @@ DrawingDisplayItem::DrawingDisplayItem(const DrawingDisplayItem& item)
 DrawingDisplayItem::~DrawingDisplayItem() {
 }
 
-void DrawingDisplayItem::SetNew(sk_sp<const SkPicture> picture) {
+void DrawingDisplayItem::SetNew(sk_sp<const PaintRecord> picture) {
   picture_ = std::move(picture);
 }
 
-sk_sp<const SkPicture> DrawingDisplayItem::GetPicture() const {
+sk_sp<const PaintRecord> DrawingDisplayItem::GetPicture() const {
   return picture_;
 }
 
 DISABLE_CFI_PERF
-void DrawingDisplayItem::Raster(SkCanvas* canvas,
-                                SkPicture::AbortCallback* callback) const {
+void DrawingDisplayItem::Raster(PaintCanvas* canvas,
+                                PaintRecord::AbortCallback* callback) const {
   if (canvas->quickReject(picture_->cullRect()))
     return;
 
-  // SkPicture always does a wrapping save/restore on the canvas, so it is not
+  // PaintRecord always does a wrapping save/restore on the canvas, so it is not
   // necessary here.
   if (callback)
     picture_->playback(canvas, callback);
@@ -81,7 +78,8 @@ void DrawingDisplayItem::AsValueInto(
   array->EndArray();
 
   std::string b64_picture;
-  PictureDebugUtil::SerializeAsBase64(picture_.get(), &b64_picture);
+  PictureDebugUtil::SerializeAsBase64(ToSkPicture(picture_.get()),
+                                      &b64_picture);
   array->SetString("skp64", b64_picture);
   array->EndDictionary();
 }