Handle nested position:sticky elements correctly (compositor)

cc/trees/property_tree.h

 // 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.
 
 #ifndef CC_TREES_PROPERTY_TREE_H_
 #define CC_TREES_PROPERTY_TREE_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 95 matching lines @@
 
 struct StickyPositionNodeData {
   int scroll_ancestor;
   LayerStickyPositionConstraint constraints;
 
   // This is the offset that blink has already applied to counteract the main
   // thread scroll offset of the scroll ancestor. We need to account for this
   // by computing the additional offset necessary to keep the element stuck.
   gfx::Vector2dF main_thread_offset;
 
-  StickyPositionNodeData() : scroll_ancestor(-1) {}
+  // In order to properly compute the sticky offset, we need to know if we have
+  // any sticky ancestors both between ourselves and our containing block and
+  // between our containing block and the viewport. These ancestors are then
+  // used to correct the constraining rect locations.
+  int nearest_node_shifting_sticky_box;
+  int nearest_node_shifting_containing_block;
+
+  StickyPositionNodeData()
+      : scroll_ancestor(-1),
+        nearest_node_shifting_sticky_box(-1),
+        nearest_node_shifting_containing_block(-1) {}
 };
 
 class CC_EXPORT TransformTree final : public PropertyTree<TransformNode> {
  public:
   TransformTree();
 
   // These C++ special member functions cannot be implicit inline because
   // they are exported by CC_EXPORT. They will be instantiated in every
   // compilation units that included this header, and compilation can fail
   // because TransformCachedNodeData may be incomplete.
@@ skipping 535 matching lines @@
   DrawTransforms& GetDrawTransforms(int transform_id, int effect_id) const;
   DrawTransformData& FetchDrawTransformsDataFromCache(int transform_id,
                                                       int effect_id) const;
 
   PropertyTreesCachedData cached_data_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_PROPERTY_TREE_H_