cc: Use sublayer scale from effect tree (2)

cc/trees/transform_node.cc

 // Copyright 2016 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 "base/trace_event/trace_event_argument.h"
 #include "cc/base/math_util.h"
 #include "cc/proto/gfx_conversions.h"
 #include "cc/proto/property_tree.pb.h"
 #include "cc/trees/transform_node.h"
 #include "ui/gfx/geometry/point3_f.h"
@@ skipping 11 matching lines @@
       is_invertible(true),
       ancestors_are_invertible(true),
       has_potential_animation(false),
       is_currently_animating(false),
       to_screen_is_potentially_animated(false),
       has_only_translation_animations(true),
       flattens_inherited_transform(false),
       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),
       affected_by_outer_viewport_bounds_delta_y(false),
       in_subtree_of_page_scale_layer(false),
       transform_changed(false),
       post_local_scale_factor(1.0f) {}
 
 TransformNode::TransformNode(const TransformNode&) = default;
 
@@ skipping 13 matching lines @@
          is_currently_animating == other.is_currently_animating &&
          to_screen_is_potentially_animated ==
              other.to_screen_is_potentially_animated &&
          has_only_translation_animations ==
              other.has_only_translation_animations &&
          flattens_inherited_transform == other.flattens_inherited_transform &&
          node_and_ancestors_are_flat == other.node_and_ancestors_are_flat &&
          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 ==
              other.affected_by_inner_viewport_bounds_delta_y &&
          affected_by_outer_viewport_bounds_delta_x ==
              other.affected_by_outer_viewport_bounds_delta_x &&
          affected_by_outer_viewport_bounds_delta_y ==
              other.affected_by_outer_viewport_bounds_delta_y &&
          in_subtree_of_page_scale_layer ==
              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 &&
          source_to_parent == other.source_to_parent;
 }
 
 void TransformNode::update_pre_local_transform(
     const gfx::Point3F& transform_origin) {
   pre_local.MakeIdentity();
   pre_local.Translate3d(-transform_origin.x(), -transform_origin.y(),
@@ skipping 41 matching lines @@
   data->set_to_screen_is_potentially_animated(
       to_screen_is_potentially_animated);
   data->set_has_only_translation_animations(has_only_translation_animations);
 
   data->set_flattens_inherited_transform(flattens_inherited_transform);
   data->set_node_and_ancestors_are_flat(node_and_ancestors_are_flat);
 
   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);
   data->set_affected_by_inner_viewport_bounds_delta_y(
       affected_by_inner_viewport_bounds_delta_y);
   data->set_affected_by_outer_viewport_bounds_delta_x(
       affected_by_outer_viewport_bounds_delta_x);
   data->set_affected_by_outer_viewport_bounds_delta_y(
       affected_by_outer_viewport_bounds_delta_y);
 
   data->set_in_subtree_of_page_scale_layer(in_subtree_of_page_scale_layer);
   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());
   Vector2dFToProto(source_to_parent, data->mutable_source_to_parent());
 }
 
 void TransformNode::FromProtobuf(const proto::TreeNode& proto) {
   id = proto.id();
   parent_id = proto.parent_id();
   owner_id = proto.owner_id();
@@ skipping 22 matching lines @@
   is_currently_animating = data.is_currently_animating();
   to_screen_is_potentially_animated = data.to_screen_is_potentially_animated();
   has_only_translation_animations = data.has_only_translation_animations();
 
   flattens_inherited_transform = data.flattens_inherited_transform();
   node_and_ancestors_are_flat = data.node_and_ancestors_are_flat();
 
   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();
   affected_by_inner_viewport_bounds_delta_y =
       data.affected_by_inner_viewport_bounds_delta_y();
   affected_by_outer_viewport_bounds_delta_x =
       data.affected_by_outer_viewport_bounds_delta_x();
   affected_by_outer_viewport_bounds_delta_y =
       data.affected_by_outer_viewport_bounds_delta_y();
 
   in_subtree_of_page_scale_layer = data.in_subtree_of_page_scale_layer();
   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());
   source_to_parent = ProtoToVector2dF(data.source_to_parent());
 }
 
 void TransformNode::AsValueInto(base::trace_event::TracedValue* value) const {
   value->SetInteger("id", id);
   value->SetInteger("parent_id", parent_id);
   value->SetInteger("owner_id", owner_id);
@@ skipping 37 matching lines @@
     const proto::TransformCachedNodeData& proto) {
   from_target = ProtoToTransform(proto.from_target());
   to_target = ProtoToTransform(proto.to_target());
   from_screen = ProtoToTransform(proto.from_screen());
   to_screen = ProtoToTransform(proto.to_screen());
   target_id = proto.target_id();
   content_target_id = proto.content_target_id();
 }
 
 }  // namespace cc