cc/blimp: Add (de)-serialization for PictureLayer and ScrollbarLayer.

cc/blimp/layer_tree_host_remote.cc

 // Copyright 2016 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/blimp/layer_tree_host_remote.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/memory/ptr_util.h"
 #include "cc/animation/animation_host.h"
 #include "cc/blimp/compositor_proto_state.h"
+#include "cc/blimp/engine_picture_cache.h"
+#include "cc/blimp/picture_data_conversions.h"
 #include "cc/blimp/remote_compositor_bridge.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/output/compositor_frame_sink.h"
 #include "cc/proto/compositor_message.pb.h"
 #include "cc/proto/layer_tree_host.pb.h"
 #include "cc/trees/layer_tree.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/task_runner_provider.h"
 
@@ skipping 18 matching lines @@
 
 LayerTreeHostRemote::LayerTreeHostRemote(InitParams* params,
                                          std::unique_ptr<LayerTree> layer_tree)
     : id_(s_layer_tree_host_sequence_number.GetNext() + 1),
       main_frame_requested_from_bridge_(false),
       client_(params->client),
       task_runner_provider_(
           TaskRunnerProvider::Create(std::move(params->main_task_runner),
                                      nullptr)),
       remote_compositor_bridge_(std::move(params->remote_compositor_bridge)),
+      engine_picture_cache_(std::move(params->engine_picture_cache)),
       settings_(*params->settings),
       layer_tree_(std::move(layer_tree)),
       weak_factory_(this) {
   DCHECK(task_runner_provider_->IsMainThread());
   DCHECK(remote_compositor_bridge_);
   DCHECK(client_);
   remote_compositor_bridge_->BindToClient(this);
+  layer_tree_->set_engine_picture_cache(engine_picture_cache_.get());
 }
 
 LayerTreeHostRemote::~LayerTreeHostRemote() = default;
 
 int LayerTreeHostRemote::GetId() const {
   return id_;
 }
 
 int LayerTreeHostRemote::SourceFrameNumber() const {
   return source_frame_number_;
@@ skipping 366 matching lines @@
   // Serialize the LayerTree.
   layer_tree_->ToProtobuf(layer_tree_host_proto->mutable_layer_tree(),
                           inputs_only);
 
   // Serialize the dirty layers.
   for (auto* layer : layer_tree_->LayersThatShouldPushProperties())
     layer->ToLayerPropertiesProto(
         layer_tree_host_proto->mutable_layer_updates(), inputs_only);
   layer_tree_->LayersThatShouldPushProperties().clear();
 
-  // TODO(khushalsagar): Deal with picture caching.
+  std::vector<PictureData> pictures =
+      engine_picture_cache_->CalculateCacheUpdateAndFlush();
+  proto::PictureDataVectorToSkPicturesProto(
+      pictures, layer_tree_host_proto->mutable_pictures());
 }
 
 }  // namespace cc