cc: Add mask and replica layer ids to the effect tree

cc/trees/property_tree_unittest.cc

 // Copyright 2014 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/property_tree.h"
 
 #include "cc/input/main_thread_scrolling_reason.h"
 #include "cc/proto/property_tree.pb.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/trees/draw_property_utils.h"
@@ skipping 169 matching lines @@
   EXPECT_EQ(original, result);
 }
 
 TEST(PropertyTreeSerializationTest, EffectNodeDataSerialization) {
   EffectNodeData original;
   original.opacity = 0.5f;
   original.screen_space_opacity = 0.6f;
   original.has_render_surface = false;
   original.transform_id = 2;
   original.clip_id = 3;
+  original.mask_layer_id = 6;
+  original.replica_layer_id = 10;
+  original.replica_mask_layer_id = 9;
 
   proto::TreeNode proto;
   original.ToProtobuf(&proto);
   EffectNodeData result;
   result.FromProtobuf(proto);
 
   EXPECT_EQ(original, result);
 }
 
 TEST(PropertyTreeSerializationTest, EffectNodeSerialization) {
@@ skipping 13 matching lines @@
 TEST(PropertyTreeSerializationTest, EffectTreeSerialization) {
   EffectTree original;
   EffectNode& root = *original.Node(0);
   root.owner_id = 5;
   root.data.transform_id = 2;
   root.data.clip_id = 1;
   EffectNode second;
   second.owner_id = 6;
   second.data.transform_id = 4;
   second.data.opacity = true;
+  second.data.mask_layer_id = 32;
   EffectNode third;
   third.owner_id = 7;
   third.data.clip_id = 3;
+  third.data.replica_layer_id = 44;
+  third.data.replica_mask_layer_id = 45;
   third.data.has_render_surface = false;
 
   original.Insert(second, 0);
   original.Insert(third, 1);
+  original.AddMaskOrReplicaLayerId(32);
+  original.AddMaskOrReplicaLayerId(44);
+  original.AddMaskOrReplicaLayerId(45);
   original.set_needs_update(true);
 
   proto::PropertyTree proto;
   original.ToProtobuf(&proto);
   EffectTree result;
   std::unordered_map<int, int> effect_id_to_index_map;
   result.FromProtobuf(proto, &effect_id_to_index_map);
 
   EXPECT_EQ(effect_id_to_index_map[5], 0);
   EXPECT_EQ(effect_id_to_index_map[6], 1);
@@ skipping 906 matching lines @@
 
 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F(
     PropertyTreeTestSingularTransformSnapTest);
 
 #undef DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F
 #undef SERIALIZED_PROPERTY_TREE_TEST_F
 #undef DIRECT_PROPERTY_TREE_TEST_F
 
 }  // namespace
 }  // namespace cc