Revert of Only create sticky position constraints for constrained sticky position.

third_party/WebKit/Source/core/layout/LayoutBoxModelObjectTest.cpp

 // 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 "core/layout/LayoutBoxModelObject.h"
 
 #include "core/dom/DOMTokenList.h"
 #include "core/dom/DocumentLifecycle.h"
 #include "core/html/HTMLElement.h"
 #include "core/layout/ImageQualityController.h"
@@ skipping 324 matching lines @@
 // computing the sticky constraints. Any such ancestor is the first sticky
 // element between you and your containing block (exclusive).
 //
 // In most cases, this pointer should be null since your parent is normally your
 // containing block. However there are cases where this is not true, including
 // inline blocks and tables. The latter is currently irrelevant since only table
 // cells can be sticky in CSS2.1, but we can test the former.
 TEST_F(LayoutBoxModelObjectTest,
        StickyPositionFindsCorrectStickyBoxShiftingAncestor) {
   SetBodyInnerHTML(
-      "<style>#stickyOuterDiv { position: sticky; top: 0;}"
-      "#stickyOuterInline { position: sticky; top: 0; display: inline; }"
-      "#unanchoredSticky { position: sticky; display: inline; }"
-      ".inline { display: inline; }"
-      "#stickyInnerInline { position: sticky; top: 0; display: inline; "
-      "}</style>"
+      "<style>#stickyOuterDiv { position: sticky; }"
+      "#stickyOuterInline { position: sticky; display: inline; }"
+      "#stickyInnerInline { position: sticky; display: inline; }"
+      ".inline { display: inline; }</style>"
       "<div id='stickyOuterDiv'>"
       "  <div id='stickyOuterInline'>"
-      "   <div id='unanchoredSticky'>"
-      "      <div class='inline'>"
-      "        <div id='stickyInnerInline'></div>"
-      "      </div>"
+      "    <div class='inline'>"
+      "      <div id='stickyInnerInline'></div>"
       "    </div>"
       "  </div>"
       "</div>");
 
   LayoutBoxModelObject* sticky_outer_div =
       ToLayoutBoxModelObject(GetLayoutObjectByElementId("stickyOuterDiv"));
   LayoutBoxModelObject* sticky_outer_inline =
       ToLayoutBoxModelObject(GetLayoutObjectByElementId("stickyOuterInline"));
-  LayoutBoxModelObject* unanchored_sticky =
-      ToLayoutBoxModelObject(GetLayoutObjectByElementId("unanchoredSticky"));
   LayoutBoxModelObject* sticky_inner_inline =
       ToLayoutBoxModelObject(GetLayoutObjectByElementId("stickyInnerInline"));
 
   PaintLayerScrollableArea* scrollable_area =
       sticky_outer_div->Layer()->AncestorOverflowLayer()->GetScrollableArea();
   ASSERT_TRUE(scrollable_area);
   StickyConstraintsMap constraints_map =
       scrollable_area->GetStickyConstraintsMap();
 
   ASSERT_TRUE(constraints_map.Contains(sticky_outer_div->Layer()));
   ASSERT_TRUE(constraints_map.Contains(sticky_outer_inline->Layer()));
-  ASSERT_FALSE(constraints_map.Contains(unanchored_sticky->Layer()));
   ASSERT_TRUE(constraints_map.Contains(sticky_inner_inline->Layer()));
 
   // The outer block element trivially has no sticky-box shifting ancestor.
   EXPECT_FALSE(constraints_map.at(sticky_outer_div->Layer())
                    .NearestStickyBoxShiftingStickyBox());
 
   // Neither does the outer inline element, as its parent element is also its
   // containing block.
   EXPECT_FALSE(constraints_map.at(sticky_outer_inline->Layer())
                    .NearestStickyBoxShiftingStickyBox());
 
   // However the inner inline element does have a sticky-box shifting ancestor,
   // as its containing block is the ancestor block element, above its ancestor
   // sticky element.
   EXPECT_EQ(sticky_outer_inline,
             constraints_map.at(sticky_inner_inline->Layer())
                 .NearestStickyBoxShiftingStickyBox());
 }
 
 // Verifies that the correct containing-block shifting ancestor is found when
 // computing the sticky constraints. Any such ancestor is the first sticky
 // element between your containing block (inclusive) and your ancestor overflow
 // layer (exclusive).
 TEST_F(LayoutBoxModelObjectTest,
        StickyPositionFindsCorrectContainingBlockShiftingAncestor) {
   // We make the scroller itself sticky in order to check that elements do not
   // detect it as their containing-block shifting ancestor.
   SetBodyInnerHTML(
-      "<style>#scroller { overflow-y: scroll; position: sticky; top: 0;}"
-      "#stickyParent { position: sticky; top: 0;}"
-      "#stickyChild { position: sticky; top: 0;}"
-      "#unanchoredSticky { position: sticky; }"
-      "#stickyNestedChild { position: sticky; top: 0;}</style>"
-      "<div id='scroller'>"
-      "  <div id='stickyParent'>"
-      "    <div id='unanchoredSticky'>"
-      "      <div id='stickyChild'></div>"
-      "      <div><div id='stickyNestedChild'></div></div>"
-      "    </div>"
-      "  </div>"
-      "</div>");
+      "<style>#scroller { overflow-y: scroll; position: sticky; }"
+      "#stickyParent { position: sticky; }"
+      "#stickyChild { position: sticky; }"
+      "#stickyNestedChild { position: sticky; }</style>"
+      "<div id='scroller'><div id='stickyParent'><div id='stickyChild'></div>"
+      "<div><div id='stickyNestedChild'></div></div></div></div>");
 
   LayoutBoxModelObject* scroller =
       ToLayoutBoxModelObject(GetLayoutObjectByElementId("scroller"));
   LayoutBoxModelObject* sticky_parent =
       ToLayoutBoxModelObject(GetLayoutObjectByElementId("stickyParent"));
   LayoutBoxModelObject* sticky_child =
       ToLayoutBoxModelObject(GetLayoutObjectByElementId("stickyChild"));
   LayoutBoxModelObject* sticky_nested_child =
       ToLayoutBoxModelObject(GetLayoutObjectByElementId("stickyNestedChild"));
 
   PaintLayerScrollableArea* scrollable_area =
       scroller->Layer()->GetScrollableArea();
   ASSERT_TRUE(scrollable_area);
   StickyConstraintsMap constraints_map =
       scrollable_area->GetStickyConstraintsMap();
 
   ASSERT_FALSE(constraints_map.Contains(scroller->Layer()));
   ASSERT_TRUE(constraints_map.Contains(sticky_parent->Layer()));
   ASSERT_TRUE(constraints_map.Contains(sticky_child->Layer()));
   ASSERT_TRUE(constraints_map.Contains(sticky_nested_child->Layer()));
 
   // The outer <div> should not detect the scroller as its containing-block
   // shifting ancestor.
   EXPECT_FALSE(constraints_map.at(sticky_parent->Layer())
                    .NearestStickyBoxShiftingContainingBlock());
 
   // Both inner children should detect the parent <div> as their
-  // containing-block shifting ancestor. They skip past unanchored sticky
-  // because it will never have a non-zero offset.
+  // containing-block shifting ancestor.
   EXPECT_EQ(sticky_parent, constraints_map.at(sticky_child->Layer())
                                .NearestStickyBoxShiftingContainingBlock());
   EXPECT_EQ(sticky_parent, constraints_map.at(sticky_nested_child->Layer())
                                .NearestStickyBoxShiftingContainingBlock());
 }
 
 // Verifies that the correct containing-block shifting ancestor is found when
 // computing the sticky constraints, in the case where the overflow ancestor is
 // the page itself. This is a special-case version of the test above, as we
 // often treat the root page as special when it comes to scroll logic. It should
 // not make a difference for containing-block shifting ancestor calculations.
 TEST_F(LayoutBoxModelObjectTest,
        StickyPositionFindsCorrectContainingBlockShiftingAncestorRoot) {
   SetBodyInnerHTML(
-      "<style>#stickyParent { position: sticky; top: 0;}"
-      "#stickyGrandchild { position: sticky; top: 0;}</style>"
+      "<style>#stickyParent { position: sticky; }"
+      "#stickyGrandchild { position: sticky; }</style>"
       "<div id='stickyParent'><div><div id='stickyGrandchild'></div></div>"
       "</div>");
 
   LayoutBoxModelObject* sticky_parent =
       ToLayoutBoxModelObject(GetLayoutObjectByElementId("stickyParent"));
   LayoutBoxModelObject* sticky_grandchild =
       ToLayoutBoxModelObject(GetLayoutObjectByElementId("stickyGrandchild"));
 
   PaintLayerScrollableArea* scrollable_area =
       sticky_parent->Layer()->AncestorOverflowLayer()->GetScrollableArea();
@@ skipping 11 matching lines @@
 }
 
 // Verifies that the correct containing-block shifting ancestor is found when
 // computing the sticky constraints, in the case of tables. Tables are unusual
 // because the containing block for all table elements is the <table> itself, so
 // we have to skip over elements to find the correct ancestor.
 TEST_F(LayoutBoxModelObjectTest,
        StickyPositionFindsCorrectContainingBlockShiftingAncestorTable) {
   SetBodyInnerHTML(
       "<style>#scroller { overflow-y: scroll; }"
-      "#stickyOuter { position: sticky; top: 0;}"
-      "#stickyTh { position: sticky; top: 0;}</style>"
+      "#stickyOuter { position: sticky; }"
+      "#stickyTh { position: sticky; }</style>"
       "<div id='scroller'><div id='stickyOuter'><table><thead><tr>"
       "<th id='stickyTh'></th></tr></thead></table></div></div>");
 
   LayoutBoxModelObject* scroller =
       ToLayoutBoxModelObject(GetLayoutObjectByElementId("scroller"));
   LayoutBoxModelObject* sticky_outer =
       ToLayoutBoxModelObject(GetLayoutObjectByElementId("stickyOuter"));
   LayoutBoxModelObject* sticky_th =
       ToLayoutBoxModelObject(GetLayoutObjectByElementId("stickyTh"));
 
@@ skipping 353 matching lines @@
   EXPECT_EQ(LayoutSize(0, 25), inner_sticky_th->StickyPositionOffset());
 }
 
 // Verifies that the calculated position:sticky offsets are correct in the case
 // of nested inline elements.
 TEST_F(LayoutBoxModelObjectTest, StickyPositionNestedInlineElements) {
   SetBodyInnerHTML(
       "<style>#scroller { width: 100px; height: 100px; overflow-y: scroll; }"
       "#paddingBefore { height: 50px; }"
       "#outerInline { display: inline; position: sticky; top: 0; }"
-      "#unanchoredSticky { position: sticky; display: inline; }"
       ".inline {display: inline;}"
       "#innerInline { display: inline; position: sticky; top: 25px; }"
       "#paddingAfter { height: 200px; }</style>"
       "<div id='scroller'>"
       "  <div id='paddingBefore'></div>"
       "  <div id='outerInline'>"
-      "    <div id='unanchoredSticky'>"
-      "      <div class='inline'>"
-      "        <div id='innerInline'></div>"
-      "      </div>"
+      "    <div class='inline'>"
+      "      <div id='innerInline'></div>"
       "    </div>"
       "  </div>"
       "  <div id='paddingAfter'></div>"
       "</div>");
 
   LayoutBoxModelObject* outer_inline =
       ToLayoutBoxModelObject(GetLayoutObjectByElementId("outerInline"));
   LayoutBoxModelObject* inner_inline =
       ToLayoutBoxModelObject(GetLayoutObjectByElementId("innerInline"));
 
@@ skipping 50 matching lines @@
 
   // TODO(smcgruer): Until http://crbug.com/686164 is fixed, we need to update
   // the constraints here before calculations will be correct.
   inner_sticky->UpdateStickyPositionConstraints();
 
   EXPECT_EQ(LayoutSize(0, 100), outer_sticky->StickyPositionOffset());
   EXPECT_EQ(LayoutSize(0, 25), inner_sticky->StickyPositionOffset());
 }
 
 }  // namespace blink