Changeset 283546 in webkit

Timestamp:

Oct 5, 2021 5:10:00 AM (10 months ago)

Author:

Martin Robinson

Message:

[css-position-sticky] scrollIntoView should not take into account sticky positioning offsets
​https://bugs.webkit.org/show_bug.cgi?id=230689

Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-position/sticky/position-sticky-scrollIntoView-expected.txt: Update results to show newly

passing test.

Source/WebCore:

When calculating the location for absolute anchors rectangles,
do not take into account sticky offsets. This means that when
scrolling to elements that are stickily positioned, their static
positions will be targeted.

No new tests. This is covered by an existing WPT test.

• rendering/RenderElement.cpp:

(WebCore::RenderElement::getLeadingCorner const): Do not take into account sticky position when calculating this point.
(WebCore::RenderElement::getTrailingCorner const): Ditto.

LayoutTests:

• platform/ios-wk2/imported/w3c/web-platform-tests/css/css-position/sticky/position-sticky-scrollIntoView-expected.txt: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-position/sticky/position-sticky-scrollIntoView-expected.txt (modified) (1 diff)
• LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/css/css-position/sticky/position-sticky-scrollIntoView-expected.txt (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderElement.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-10-05  Martin Robinson  <mrobinson@webkit.org>
+
+        [css-position-sticky] scrollIntoView should not take into account sticky positioning offsets
+        https://bugs.webkit.org/show_bug.cgi?id=230689
+
+        Reviewed by Simon Fraser.
+
+        * platform/ios-wk2/imported/w3c/web-platform-tests/css/css-position/sticky/position-sticky-scrollIntoView-expected.txt: Removed.
+
 2021-10-05  Youenn Fablet  <youenn@apple.com>
 

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-10-05  Martin Robinson  <mrobinson@webkit.org>
+
+        [css-position-sticky] scrollIntoView should not take into account sticky positioning offsets
+        https://bugs.webkit.org/show_bug.cgi?id=230689
+
+        Reviewed by Simon Fraser.
+
+        * web-platform-tests/css/css-position/sticky/position-sticky-scrollIntoView-expected.txt: Update results to show newly
+        passing test.
+
 2021-10-05  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-position/sticky/position-sticky-scrollIntoView-expected.txt

@@ -6 +6 @@
 
 
-FAIL scrolling a sticky element into view should use its unshifted position assert_approx_equals: expected 1122 +/- 1 but got 561
+PASS scrolling a sticky element into view should use its unshifted position
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-05  Martin Robinson  <mrobinson@webkit.org>
+
+        [css-position-sticky] scrollIntoView should not take into account sticky positioning offsets
+        https://bugs.webkit.org/show_bug.cgi?id=230689
+
+        Reviewed by Simon Fraser.
+
+        When calculating the location for absolute anchors rectangles,
+        do not take into account sticky offsets. This means that when
+        scrolling to elements that are stickily positioned, their static
+        positions will be targeted.
+
+        No new tests. This is covered by an existing WPT test.
+
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::getLeadingCorner const): Do not take into account sticky position when calculating this point.
+        (WebCore::RenderElement::getTrailingCorner const): Ditto.
+
 2021-10-05  Tim Nguyen  <ntim@apple.com>
 

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -1614 +1614 @@
 bool RenderElement::getLeadingCorner(FloatPoint& point, bool& insideFixed) const
 {
+    // When scrolling elements into view, ignore sticky offsets and scroll to the static
+    // position of the element. See: https://drafts.csswg.org/css-position/#stickypos-scroll.
+    OptionSet<MapCoordinatesMode> localToAbsoluteMode { UseTransforms, IgnoreStickyOffsets };
+
     if (!isInline() || isReplaced()) {
-        point = localToAbsolute(FloatPoint(), UseTransforms, &insideFixed);
+        point = localToAbsolute(FloatPoint(), localToAbsoluteMode, &insideFixed);
         return true;
     }
@@ -1641 +1645 @@
 
         if (!o->isInline() || o->isReplaced()) {
-            point = o->localToAbsolute(FloatPoint(), UseTransforms, &insideFixed);
+            point = o->localToAbsolute(FloatPoint(), localToAbsoluteMode, &insideFixed);
             return true;
         }
@@ -1655 +1659 @@
             } else if (is<RenderBox>(*o))
                 point.moveBy(downcast<RenderBox>(*o).location());
-            point = o->container()->localToAbsolute(point, UseTransforms, &insideFixed);
+            point = o->container()->localToAbsolute(point, localToAbsoluteMode, &insideFixed);
             return true;
         }
@@ -1671 +1675 @@
 bool RenderElement::getTrailingCorner(FloatPoint& point, bool& insideFixed) const
 {
+    // When scrolling elements into view, ignore sticky offsets and scroll to the static
+    // position of the element. See: https://drafts.csswg.org/css-position/#stickypos-scroll.
+    OptionSet<MapCoordinatesMode> localToAbsoluteMode { UseTransforms, IgnoreStickyOffsets };
+
     if (!isInline() || isReplaced()) {
-        point = localToAbsolute(LayoutPoint(downcast<RenderBox>(*this).size()), UseTransforms, &insideFixed);
+        point = localToAbsolute(LayoutPoint(downcast<RenderBox>(*this).size()), localToAbsoluteMode, &insideFixed);
         return true;
     }
@@ -1703 +1711 @@
             } else
                 point.moveBy(downcast<RenderBox>(*o).frameRect().maxXMaxYCorner());
-            point = o->container()->localToAbsolute(point, UseTransforms, &insideFixed);
+            point = o->container()->localToAbsolute(point, localToAbsoluteMode, &insideFixed);
             return true;
         }