cc: Use sublayer scale from effect tree (1)

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 97 matching lines @@
   EXPECT_EQ(transform_id_to_index_map[3], 2);
   EXPECT_EQ(original, result);
 }
 
 TEST(PropertyTreeSerializationTest, ClipNodeDataSerialization) {
   ClipNodeData original;
   original.clip = gfx::RectF(0.5f, 0.5f);
   original.combined_clip_in_target_space = gfx::RectF(0.6f, 0.6f);
   original.clip_in_target_space = gfx::RectF(0.7f, 0.7f);
   original.transform_id = 2;
-  original.target_id = 3;
+  original.target_transform_id = 3;
+  original.target_effect_id = 4;
   original.applies_local_clip = false;
   original.layer_clipping_uses_only_local_clip = false;
   original.target_is_clipped = false;
   original.layers_are_clipped = false;
   original.layers_are_clipped_when_surfaces_disabled = false;
   original.resets_clip = false;
 
   proto::TreeNode proto;
   original.ToProtobuf(&proto);
   ClipNodeData result;
@@ skipping 14 matching lines @@
   result.FromProtobuf(proto);
 
   EXPECT_EQ(original, result);
 }
 
 TEST(PropertyTreeSerializationTest, ClipTreeSerialization) {
   ClipTree original;
   ClipNode& root = *original.Node(0);
   root.owner_id = 1;
   root.data.transform_id = 2;
-  root.data.target_id = 1;
+  root.data.target_transform_id = 1;
+  root.data.target_effect_id = 1;
   ClipNode second;
   second.owner_id = 2;
   second.data.transform_id = 4;
   second.data.applies_local_clip = true;
   ClipNode third;
   third.owner_id = 3;
-  third.data.target_id = 3;
+  third.data.target_transform_id = 3;
+  third.data.target_effect_id = 2;
   third.data.target_is_clipped = false;
 
   original.Insert(second, 0);
   original.Insert(third, 1);
   original.set_needs_update(true);
 
   proto::PropertyTree proto;
   original.ToProtobuf(&proto);
   ClipTree result;
   std::unordered_map<int, int> clip_id_to_index_map;
@@ skipping 981 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