cc: Use sublayer scale from effect tree (2)

cc/trees/transform_node.cc

Index: cc/trees/transform_node.cc
diff --git a/cc/trees/transform_node.cc b/cc/trees/transform_node.cc
index ab2693b3a5090fc23a9295ecfb5b2d18f0809def..34dd9af559fc1794c303f866f99005321c2581dd 100644
--- a/cc/trees/transform_node.cc
+++ b/cc/trees/transform_node.cc
@@ -29,7 +29,7 @@ TransformNode::TransformNode()
       node_and_ancestors_are_flat(true),
       node_and_ancestors_have_only_integer_translation(true),
       scrolls(false),
-      needs_sublayer_scale(false),
+      needs_surface_contents_scale(false),
       affected_by_inner_viewport_bounds_delta_x(false),
       affected_by_inner_viewport_bounds_delta_y(false),
       affected_by_outer_viewport_bounds_delta_x(false),
@@ -63,7 +63,7 @@ bool TransformNode::operator==(const TransformNode& other) const {
          node_and_ancestors_have_only_integer_translation ==
              other.node_and_ancestors_have_only_integer_translation &&
          scrolls == other.scrolls &&
-         needs_sublayer_scale == other.needs_sublayer_scale &&
+         needs_surface_contents_scale == other.needs_surface_contents_scale &&
          affected_by_inner_viewport_bounds_delta_x ==
              other.affected_by_inner_viewport_bounds_delta_x &&
          affected_by_inner_viewport_bounds_delta_y ==
@@ -76,7 +76,7 @@ bool TransformNode::operator==(const TransformNode& other) const {
              other.in_subtree_of_page_scale_layer &&
          transform_changed == other.transform_changed &&
          post_local_scale_factor == other.post_local_scale_factor &&
-         sublayer_scale == other.sublayer_scale &&
+         surface_contents_scale == other.surface_contents_scale &&
          scroll_offset == other.scroll_offset &&
          scroll_snap == other.scroll_snap &&
          source_offset == other.source_offset &&
@@ -138,7 +138,7 @@ void TransformNode::ToProtobuf(proto::TreeNode* proto) const {
   data->set_node_and_ancestors_have_only_integer_translation(
       node_and_ancestors_have_only_integer_translation);
   data->set_scrolls(scrolls);
-  data->set_needs_sublayer_scale(needs_sublayer_scale);
+  data->set_needs_surface_contents_scale(needs_surface_contents_scale);
 
   data->set_affected_by_inner_viewport_bounds_delta_x(
       affected_by_inner_viewport_bounds_delta_x);
@@ -153,7 +153,8 @@ void TransformNode::ToProtobuf(proto::TreeNode* proto) const {
   data->set_transform_changed(transform_changed);
   data->set_post_local_scale_factor(post_local_scale_factor);
 
-  Vector2dFToProto(sublayer_scale, data->mutable_sublayer_scale());
+  Vector2dFToProto(surface_contents_scale,
+                   data->mutable_surface_contents_scale());
   ScrollOffsetToProto(scroll_offset, data->mutable_scroll_offset());
   Vector2dFToProto(scroll_snap, data->mutable_scroll_snap());
   Vector2dFToProto(source_offset, data->mutable_source_offset());
@@ -196,7 +197,7 @@ void TransformNode::FromProtobuf(const proto::TreeNode& proto) {
   node_and_ancestors_have_only_integer_translation =
       data.node_and_ancestors_have_only_integer_translation();
   scrolls = data.scrolls();
-  needs_sublayer_scale = data.needs_sublayer_scale();
+  needs_surface_contents_scale = data.needs_surface_contents_scale();
 
   affected_by_inner_viewport_bounds_delta_x =
       data.affected_by_inner_viewport_bounds_delta_x();
@@ -211,7 +212,7 @@ void TransformNode::FromProtobuf(const proto::TreeNode& proto) {
   transform_changed = data.transform_changed();
   post_local_scale_factor = data.post_local_scale_factor();
 
-  sublayer_scale = ProtoToVector2dF(data.sublayer_scale());
+  surface_contents_scale = ProtoToVector2dF(data.surface_contents_scale());
   scroll_offset = ProtoToScrollOffset(data.scroll_offset());
   scroll_snap = ProtoToVector2dF(data.scroll_snap());
   source_offset = ProtoToVector2dF(data.source_offset());