cc: Reland Move data to LayerTree from LayerTreeHost.

cc/layers/layer_proto_converter.h

 // Copyright 2015 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.
 
 #ifndef CC_LAYERS_LAYER_PROTO_CONVERTER_H_
 #define CC_LAYERS_LAYER_PROTO_CONVERTER_H_
 
 #include <unordered_map>
 
 #include "base/macros.h"
@@ skipping 16 matching lines @@
                                       proto::LayerNode* root_node);
 
   // Recursively iterate over the given LayerNode proto and read the structure
   // into a local Layer structure, re-using existing Layers. returns the new
   // root Layer after updating the hierarchy (may be the same as
   // |existing_root|). |existing_root| may be null, which might happen during
   // the first deserialize.
   static scoped_refptr<Layer> DeserializeLayerHierarchy(
       const scoped_refptr<Layer> existing_root,
       const proto::LayerNode& root_node,
-      LayerTreeHost* layer_tree_host);
+      LayerTreeHost* layer_tree);

[vmpstr, 2016/08/17 20:28:15]

nit: this is still a layer_tree_host.

 
   // Serializes the properties of all the dirty nodes in the Layer hierarchy.
   // The proto::LayerUpdate will contain all nodes that are dirty. These nodes
   // will contain the list of dirty properties. This function also resets the
   // layers that need push properties set.
   static void SerializeLayerProperties(LayerTreeHost* host,
                                        proto::LayerUpdate* layer_update);
 
   // Iterate over all updated layers from the LayerUpdate, and update the
   // local Layers. |existing_root| must not be null, as that will make it
@@ skipping 24 matching lines @@
   // and special layers to |layer_id_map|.
   // TODO(vmpstr): LayerIdMap ref counts layers, so this function needs to deal
   // with ref counted objects instead of iterating over raw pointers.
   static void RecursivelyFindAllLayers(Layer* root_layer,
                                        LayerIdMap* layer_id_map);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_PROTO_CONVERTER_H_