cc: Use sublayer scale from effect tree (1)

cc/trees/property_tree.cc

Index: cc/trees/property_tree.cc
diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc
index 1612ff5214c48ee20f4db2e920034ba2d6a4e317..b7ec2fd4fc09d44d84352c5941ef1b5730806deb 100644
--- a/cc/trees/property_tree.cc
+++ b/cc/trees/property_tree.cc
@@ -403,7 +403,8 @@ void TransformCachedNodeData::FromProtobuf(
 
 ClipNodeData::ClipNodeData()
     : transform_id(-1),
-      target_id(-1),
+      target_transform_id(-1),
+      target_effect_id(-1),
       applies_local_clip(true),
       layer_clipping_uses_only_local_clip(false),
       target_is_clipped(false),
@@ -417,7 +418,9 @@ bool ClipNodeData::operator==(const ClipNodeData& other) const {
   return clip == other.clip &&
          combined_clip_in_target_space == other.combined_clip_in_target_space &&
          clip_in_target_space == other.clip_in_target_space &&
-         transform_id == other.transform_id && target_id == other.target_id &&
+         transform_id == other.transform_id &&
+         target_transform_id == other.target_transform_id &&
+         target_effect_id == other.target_effect_id &&
          applies_local_clip == other.applies_local_clip &&
          layer_clipping_uses_only_local_clip ==
              other.layer_clipping_uses_only_local_clip &&
@@ -438,7 +441,8 @@ void ClipNodeData::ToProtobuf(proto::TreeNode* proto) const {
   RectFToProto(clip_in_target_space, data->mutable_clip_in_target_space());
 
   data->set_transform_id(transform_id);
-  data->set_target_id(target_id);
+  data->set_target_transform_id(target_transform_id);
+  data->set_target_effect_id(target_effect_id);
   data->set_applies_local_clip(applies_local_clip);
   data->set_layer_clipping_uses_only_local_clip(
       layer_clipping_uses_only_local_clip);
@@ -459,7 +463,8 @@ void ClipNodeData::FromProtobuf(const proto::TreeNode& proto) {
   clip_in_target_space = ProtoToRectF(data.clip_in_target_space());
 
   transform_id = data.transform_id();
-  target_id = data.target_id();
+  target_transform_id = data.target_transform_id();
+  target_effect_id = data.target_effect_id();
   applies_local_clip = data.applies_local_clip();
   layer_clipping_uses_only_local_clip =
       data.layer_clipping_uses_only_local_clip();
@@ -473,7 +478,8 @@ void ClipNodeData::FromProtobuf(const proto::TreeNode& proto) {
 void ClipNodeData::AsValueInto(base::trace_event::TracedValue* value) const {
   MathUtil::AddToTracedValue("clip", clip, value);
   value->SetInteger("transform_id", transform_id);
-  value->SetInteger("target_id", target_id);
+  value->SetInteger("target_transform_id", target_transform_id);
+  value->SetInteger("target_effect_id", target_effect_id);
   value->SetBoolean("applies_local_clip", applies_local_clip);
   value->SetBoolean("layer_clipping_uses_only_local_clip",
                     layer_clipping_uses_only_local_clip);