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 4d1b3d2a7a2776f06449eb8607e7921aad2d492b..988d03f3ad53d7bae8469e0c658bb350f5d5e362 100644
--- a/cc/playback/drawing_display_item.cc
+++ b/cc/playback/drawing_display_item.cc
@@ -16,19 +16,16 @@
 #include "cc/blimp/image_serialization_processor.h"
 #include "cc/debug/picture_debug_util.h"
 #include "cc/proto/display_item.pb.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));
 }
@@ -47,7 +44,8 @@ DrawingDisplayItem::DrawingDisplayItem(
   DCHECK(sk_picture_id.has_unique_id());
 
   uint32_t unique_id = sk_picture_id.unique_id();
-  sk_sp<const SkPicture> picture = client_picture_cache->GetPicture(unique_id);
+  sk_sp<const PaintRecord> picture =
+      client_picture_cache->GetPicture(unique_id);
   DCHECK(picture);
 
   used_engine_picture_ids->push_back(unique_id);
@@ -62,7 +60,7 @@ 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);
 }
 
@@ -77,17 +75,17 @@ void DrawingDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
       picture_->uniqueID());
 }
 
-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);
@@ -116,7 +114,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();
 }