Add sticky nodes affected by inner and outer viewport bounds deltas.

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 13 matching lines @@
       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),
       should_be_snapped(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),
+      moved_by_inner_viewport_bounds_delta_x(false),
+      moved_by_inner_viewport_bounds_delta_y(false),
+      moved_by_outer_viewport_bounds_delta_x(false),
+      moved_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;
 
 bool TransformNode::operator==(const TransformNode& other) const {
   return id == other.id && parent_id == other.parent_id &&
          owner_id == other.owner_id && pre_local == other.pre_local &&
          local == other.local && post_local == other.post_local &&
@@ skipping 10 matching lines @@
          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 &&
          should_be_snapped == other.should_be_snapped &&
-         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 &&
+         moved_by_inner_viewport_bounds_delta_x ==
+             other.moved_by_inner_viewport_bounds_delta_x &&
+         moved_by_inner_viewport_bounds_delta_y ==
+             other.moved_by_inner_viewport_bounds_delta_y &&
+         moved_by_outer_viewport_bounds_delta_x ==
+             other.moved_by_outer_viewport_bounds_delta_x &&
+         moved_by_outer_viewport_bounds_delta_y ==
+             other.moved_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 &&
          scroll_offset == other.scroll_offset &&
          snap_amount == other.snap_amount &&
          source_offset == other.source_offset &&
          source_to_parent == other.source_to_parent;
 }
 
@@ skipping 47 matching lines @@
   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_should_be_snapped(should_be_snapped);
 
-  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_moved_by_inner_viewport_bounds_delta_x(
+      moved_by_inner_viewport_bounds_delta_x);
+  data->set_moved_by_inner_viewport_bounds_delta_y(
+      moved_by_inner_viewport_bounds_delta_y);
+  data->set_moved_by_outer_viewport_bounds_delta_x(
+      moved_by_outer_viewport_bounds_delta_x);
+  data->set_moved_by_outer_viewport_bounds_delta_y(
+      moved_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);
 
   ScrollOffsetToProto(scroll_offset, data->mutable_scroll_offset());
   Vector2dFToProto(snap_amount, data->mutable_snap_amount());
   Vector2dFToProto(source_offset, data->mutable_source_offset());
   Vector2dFToProto(source_to_parent, data->mutable_source_to_parent());
 }
@@ skipping 29 matching lines @@
   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();
   should_be_snapped = data.should_be_snapped();
 
-  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();
+  moved_by_inner_viewport_bounds_delta_x =
+      data.moved_by_inner_viewport_bounds_delta_x();
+  moved_by_inner_viewport_bounds_delta_y =
+      data.moved_by_inner_viewport_bounds_delta_y();
+  moved_by_outer_viewport_bounds_delta_x =
+      data.moved_by_outer_viewport_bounds_delta_x();
+  moved_by_outer_viewport_bounds_delta_y =
+      data.moved_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();
 
   scroll_offset = ProtoToScrollOffset(data.scroll_offset());
   snap_amount = ProtoToVector2dF(data.snap_amount());
   source_offset = ProtoToVector2dF(data.source_offset());
   source_to_parent = ProtoToVector2dF(data.source_to_parent());
 }
@@ skipping 39 matching lines @@
 
 void TransformCachedNodeData::FromProtobuf(
     const proto::TransformCachedNodeData& proto) {
   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