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

cc/trees/layer_tree_host_unittest_serialization.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/trees/layer_tree_host.h"
 
 #include "cc/layers/heads_up_display_layer.h"
 #include "cc/layers/layer.h"
 #include "cc/proto/layer.pb.h"
 #include "cc/proto/layer_tree_host.pb.h"
@@ skipping 31 matching lines @@
 
     // Need to reset root layer and LayerTreeHost pointers before tear down.
     layer_tree_host_src_->SetRootLayer(nullptr);
     layer_tree_host_src_ = nullptr;
     layer_tree_host_dst_->SetRootLayer(nullptr);
     layer_tree_host_dst_ = nullptr;
   }
 
   void VerifySerializationAndDeserialization() {
     proto::LayerTreeHost proto;
+
+    std::unordered_set<Layer*> layers_that_should_push_properties_src =
+        layer_tree_host_src_->LayersThatShouldPushProperties();
     layer_tree_host_src_->ToProtobufForCommit(&proto);
     layer_tree_host_dst_->FromProtobufForCommit(proto);
 
     EXPECT_EQ(layer_tree_host_src_->needs_full_tree_sync_,
               layer_tree_host_dst_->needs_full_tree_sync_);
     EXPECT_EQ(layer_tree_host_src_->needs_meta_info_recomputation_,
               layer_tree_host_dst_->needs_meta_info_recomputation_);
     EXPECT_EQ(layer_tree_host_src_->source_frame_number_,
               layer_tree_host_dst_->source_frame_number_);
     EXPECT_EQ(layer_tree_host_src_->meta_information_sequence_number_,
@@ skipping 33 matching lines @@
               layer_tree_host_dst_->content_is_suitable_for_gpu_rasterization_);
     EXPECT_EQ(layer_tree_host_src_->background_color_,
               layer_tree_host_dst_->background_color_);
     EXPECT_EQ(layer_tree_host_src_->has_transparent_background_,
               layer_tree_host_dst_->has_transparent_background_);
     EXPECT_EQ(layer_tree_host_src_->in_paint_layer_contents_,
               layer_tree_host_dst_->in_paint_layer_contents_);
     EXPECT_EQ(layer_tree_host_src_->id_, layer_tree_host_dst_->id_);
     EXPECT_EQ(layer_tree_host_src_->next_commit_forces_redraw_,
               layer_tree_host_dst_->next_commit_forces_redraw_);
+    for (auto layer : layers_that_should_push_properties_src) {
+      EXPECT_TRUE(layer_tree_host_dst_->LayerNeedsPushPropertiesForTesting(
+          layer_tree_host_dst_->LayerById(layer->id())));
+    }
 
     if (layer_tree_host_src_->hud_layer_) {
       EXPECT_EQ(layer_tree_host_src_->hud_layer_->id(),
                 layer_tree_host_dst_->hud_layer_->id());
       // The HUD layer member is a HeadsUpDisplayLayer instead of Layer, so
       // inspect the proto to see if it contains the the right layer type.
       bool found_hud_layer_type = false;
       for (int i = 0; i < proto.root_layer().children_size(); ++i) {
         if (proto.root_layer().children(i).id() ==
             layer_tree_host_src_->hud_layer_->id()) {
@@ skipping 201 matching lines @@
 
 TEST_F(LayerTreeHostSerializationTest, LayersChanged) {
   RunLayersChangedTest();
 }
 
 TEST_F(LayerTreeHostSerializationTest, LayersChangedMultipleSerializations) {
   LayersChangedMultipleSerializations();
 }
 
 }  // namespace cc