cc : Make tree synchronization independent of layer tree hierarchy (2)

cc/layers/layer_proto_converter.cc

 // 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.
 
 #include "cc/layers/layer_proto_converter.h"
 
 #include "base/stl_util.h"
 #include "cc/layers/empty_content_layer_client.h"
 #include "cc/layers/heads_up_display_layer.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/proto/layer.pb.h"
+#include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_settings.h"
 
 namespace cc {
 
 LayerProtoConverter::LayerProtoConverter() {}
 
 LayerProtoConverter::~LayerProtoConverter() {}
 
 // static
@@ skipping 17 matching lines @@
     // The root node has changed or there was no root node,
     // so find or create the new root.
     new_root = FindOrAllocateAndConstruct(root_node, layer_id_map);
   }
   new_root->FromLayerNodeProto(root_node, layer_id_map);
   return new_root;
 }
 
 // static
 void LayerProtoConverter::SerializeLayerProperties(
-    Layer* root_layer,
+    LayerTreeHost* host,
     proto::LayerUpdate* layer_update) {
-  RecursivelySerializeLayerProperties(root_layer, layer_update);
+  for (auto layer : host->LayersThatShouldPushProperties())
+    layer->ToLayerPropertiesProto(layer_update);
+  host->LayersThatShouldPushProperties().clear();
 }
 
 // static
 void LayerProtoConverter::DeserializeLayerProperties(
     Layer* existing_root,
     const proto::LayerUpdate& layer_update) {
   DCHECK(existing_root);
   LayerIdMap layer_id_map;
   RecursivelyFindAllLayers(existing_root, &layer_id_map);
 
   for (int i = 0; i < layer_update.layers_size(); ++i) {
     const proto::LayerProperties& layer_properties = layer_update.layers(i);
 
     Layer::LayerIdMap::const_iterator iter =
         layer_id_map.find(layer_properties.id());
     DCHECK(iter != layer_id_map.end());
 
     iter->second->FromLayerPropertiesProto(layer_properties);
   }
 }
 
 // static
-void LayerProtoConverter::RecursivelySerializeLayerProperties(
-    Layer* layer,
-    proto::LayerUpdate* layer_update) {
-  bool serialize_descendants = layer->ToLayerPropertiesProto(layer_update);
-  if (!serialize_descendants)
-    return;
-
-  for (const auto& child : layer->children()) {
-    RecursivelySerializeLayerProperties(child.get(), layer_update);
-  }
-  if (layer->mask_layer())
-    RecursivelySerializeLayerProperties(layer->mask_layer(), layer_update);
-  if (layer->replica_layer())
-    RecursivelySerializeLayerProperties(layer->replica_layer(), layer_update);
-}
-
-// static
 void LayerProtoConverter::RecursivelyFindAllLayers(Layer* root_layer,
                                                    LayerIdMap* layer_id_map) {
   LayerTreeHostCommon::CallFunctionForSubtree(
       root_layer,
       [layer_id_map](Layer* layer) { (*layer_id_map)[layer->id()] = layer; });
 }
 
 // static
 scoped_refptr<Layer> LayerProtoConverter::FindOrAllocateAndConstruct(
     const proto::LayerNode& proto,
@@ skipping 15 matching lines @@
     case proto::LayerNode::HEADS_UP_DISPLAY_LAYER:
       return HeadsUpDisplayLayer::Create();
   }
   // TODO(nyquist): Add the rest of the necessary LayerTypes. This function
   // should not return null.
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace cc