Unify the calculation of main thread offset of sticky element

cc/trees/property_tree.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 <stddef.h>
 
 #include <set>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 354 matching lines @@
     // The scroll position does not include snapping which shifts the scroll
     // offset to align to a pixel boundary, we need to manually include it here.
     // In this case, snapping is caused by a scroll.
     scroll_position -= transform_node->snap_amount;
   }
 
   gfx::RectF clip(
       scroll_position,
       gfx::SizeF(property_trees.scroll_tree.scroll_clip_layer_bounds(
           scroll_node->id)));
-  gfx::Vector2dF layer_offset(sticky_data->main_thread_offset);
 
   gfx::Vector2dF ancestor_sticky_box_offset;
   if (sticky_data->nearest_node_shifting_sticky_box !=
       TransformTree::kInvalidNodeId) {
     ancestor_sticky_box_offset =
         tree->StickyPositionData(sticky_data->nearest_node_shifting_sticky_box)
             ->total_sticky_box_sticky_offset;
   }
 
   gfx::Vector2dF ancestor_containing_block_offset;
@@ skipping 64 matching lines @@
     sticky_offset.set_y(sticky_offset.y() + top_delta);
   }
 
   sticky_data->total_sticky_box_sticky_offset =
       ancestor_sticky_box_offset + sticky_offset -
       sticky_box_rect.OffsetFromOrigin();
   sticky_data->total_containing_block_sticky_offset =
       ancestor_sticky_box_offset + ancestor_containing_block_offset +
       sticky_offset - sticky_box_rect.OffsetFromOrigin();
 
-  return sticky_offset - layer_offset - node->source_to_parent -
+  gfx::Vector2dF sticky_main_thread_offset(

[flackr, 2017/05/31 14:08:22]

Rather than converting to a Vector2dF every time, perhaps we should store this
as a Vector2dF. This also matches many of the other offsets on TransformNode.

[yigu, 2017/06/01 15:15:19]

Done.

+      node->sticky_main_thread_offset.width(),
+      node->sticky_main_thread_offset.height());
+
+  return sticky_offset - sticky_main_thread_offset -
          sticky_box_rect.OffsetFromOrigin();
 }
 
 void TransformTree::UpdateLocalTransform(TransformNode* node) {
   gfx::Transform transform = node->post_local;
   if (NeedsSourceToParentUpdate(node)) {
     gfx::Transform to_parent;
     ComputeTranslation(node->source_node_id, node->parent_id, &to_parent);
     gfx::Vector2dF unsnapping;
     TransformNode* current;
@@ skipping 1631 matching lines @@
   const EffectNode* effect_node = effect_tree.Node(effect_id);
 
   if (effect_node->surface_contents_scale.x() != 0.0 &&
       effect_node->surface_contents_scale.y() != 0.0)
     screen_space_transform.Scale(1.0 / effect_node->surface_contents_scale.x(),
                                  1.0 / effect_node->surface_contents_scale.y());
   return screen_space_transform;
 }
 
 }  // namespace cc