Rename paint data structures

cc/layers/picture_layer.cc

Index: cc/layers/picture_layer.cc
diff --git a/cc/layers/picture_layer.cc b/cc/layers/picture_layer.cc
index 8ed4c8b768a36055971a4d5a1da27b8d7efeadf8..e4e5a91f642061aa4cc796a5b3793c3ffe561eee 100644
--- a/cc/layers/picture_layer.cc
+++ b/cc/layers/picture_layer.cc
@@ -10,13 +10,13 @@
 #include "cc/blimp/engine_picture_cache.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer_impl.h"
+#include "cc/paint/paint_record.h"
 #include "cc/playback/recording_source.h"
 #include "cc/proto/cc_conversions.h"
 #include "cc/proto/gfx_conversions.h"
 #include "cc/proto/layer.pb.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_impl.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 
 namespace cc {
@@ -146,10 +146,10 @@ void PictureLayer::SetIsMask(bool is_mask) {
   is_mask_ = is_mask;
 }
 
-sk_sp<SkPicture> PictureLayer::GetPicture() const {
+sk_sp<PaintRecord> PictureLayer::GetPicture() const {
   // We could either flatten the RecordingSource into a single
-  // SkPicture, or paint a fresh one depending on what we intend to do with the
-  // picture. For now we just paint a fresh one to get consistent results.
+  // PaintRecord, or paint a fresh one depending on what we intend to do with
+  // the picture. For now we just paint a fresh one to get consistent results.

[danakj, 2017/01/20 23:34:13]

"picture" no longer right

[enne (OOO), 2017/01/24 01:51:27]

Changed here.  In general, I'll follow up with changing picture identifiers to
record in a different patch, since this patch is already gigantic.  I've left
some TODOs as per vmpstr's request.

   if (!DrawsContent())
     return nullptr;
 
@@ -221,7 +221,7 @@ void PictureLayer::ToLayerPropertiesProto(proto::LayerProperties* proto) {
     picture_layer_inputs_.display_list->ToProtobuf(
         picture->mutable_display_list());
     for (const auto& item : *picture_layer_inputs_.display_list) {
-      sk_sp<const SkPicture> picture = item.GetPicture();
+      sk_sp<const SkPicture> picture = ToSkPicture(item.GetPicture());
       // Only DrawingDisplayItems have SkPictures.
       if (!picture)
         continue;