Rename paint data structures

cc/layers/picture_layer.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/picture_layer.h"
 
 #include "base/auto_reset.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/blimp/client_picture_cache.h"
 #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 {
 
 PictureLayer::PictureLayerInputs::PictureLayerInputs() = default;
 
 PictureLayer::PictureLayerInputs::~PictureLayerInputs() = default;
 
 scoped_refptr<PictureLayer> PictureLayer::Create(ContentLayerClient* client) {
   return make_scoped_refptr(new PictureLayer(client));
@@ skipping 109 matching lines @@
     last_updated_invalidation_.Clear();
   }
 
   return updated;
 }
 
 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;
 
   gfx::Size layer_size = bounds();
   RecordingSource recording_source;
   Region recording_invalidation;
 
   gfx::Rect new_recorded_viewport =
       picture_layer_inputs_.client->PaintableRegion();
   scoped_refptr<DisplayItemList> display_list =
@@ skipping 36 matching lines @@
 }
 
 bool PictureLayer::HasDrawableContent() const {
   return picture_layer_inputs_.client && Layer::HasDrawableContent();
 }
 
 void PictureLayer::SetTypeForProtoSerialization(proto::LayerNode* proto) const {
   proto->set_type(proto::LayerNode::PICTURE_LAYER);
 }
 
 void PictureLayer::ToLayerPropertiesProto(proto::LayerProperties* proto) {

[vmpstr, 2017/01/21 01:11:31]

I think these proto functions are gone. Might be worth rebasing on
https://codereview.chromium.org/2646623002/ (it's in tot already)

   DCHECK(GetLayerTree());
   DCHECK(GetLayerTree()->engine_picture_cache());
 
   Layer::ToLayerPropertiesProto(proto);
   DropRecordingSourceContentIfInvalid();
   proto::PictureLayerProperties* picture = proto->mutable_picture();
 
   picture->set_nearest_neighbor(picture_layer_inputs_.nearest_neighbor);
   RectToProto(picture_layer_inputs_.recorded_viewport,
               picture->mutable_recorded_viewport());
   if (picture_layer_inputs_.display_list) {
     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;
 
       GetLayerTree()->engine_picture_cache()->MarkUsed(picture.get());
     }
   }
 }
 
 void PictureLayer::RunMicroBenchmark(MicroBenchmark* benchmark) {
@@ skipping 25 matching lines @@
     picture_layer_inputs_.display_list = nullptr;
     picture_layer_inputs_.painter_reported_memory_usage = 0;
   }
 }
 
 const DisplayItemList* PictureLayer::GetDisplayItemList() {
   return picture_layer_inputs_.display_list.get();
 }
 
 }  // namespace cc