Title: [287567] trunk
Revision
287567
Author
commit-qu...@webkit.org
Date
2022-01-04 07:52:54 -0800 (Tue, 04 Jan 2022)

Log Message

Unreviewed, reverting r283546.
https://bugs.webkit.org/show_bug.cgi?id=234844

Causes bad scrolling behavior on Discourse pages

Reverted changeset:

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

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (287566 => 287567)


--- trunk/LayoutTests/ChangeLog	2022-01-04 15:27:18 UTC (rev 287566)
+++ trunk/LayoutTests/ChangeLog	2022-01-04 15:52:54 UTC (rev 287567)
@@ -1,3 +1,17 @@
+2022-01-04  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, reverting r283546.
+        https://bugs.webkit.org/show_bug.cgi?id=234844
+
+        Causes bad scrolling behavior on Discourse pages
+
+        Reverted changeset:
+
+        "[css-position-sticky] scrollIntoView should not take into
+        account sticky positioning offsets"
+        https://bugs.webkit.org/show_bug.cgi?id=230689
+        https://commits.webkit.org/r283546
+
 2022-01-04  Manuel Rego Casasnovas  <r...@igalia.com>
 
         [selectors] :focus-visible not matching on accessKey focus after focusing something via mouse

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (287566 => 287567)


--- trunk/LayoutTests/imported/w3c/ChangeLog	2022-01-04 15:27:18 UTC (rev 287566)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2022-01-04 15:52:54 UTC (rev 287567)
@@ -1,3 +1,17 @@
+2022-01-04  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, reverting r283546.
+        https://bugs.webkit.org/show_bug.cgi?id=234844
+
+        Causes bad scrolling behavior on Discourse pages
+
+        Reverted changeset:
+
+        "[css-position-sticky] scrollIntoView should not take into
+        account sticky positioning offsets"
+        https://bugs.webkit.org/show_bug.cgi?id=230689
+        https://commits.webkit.org/r283546
+
 2022-01-03  Commit Queue  <commit-qu...@webkit.org>
 
         Unreviewed, reverting r287550.

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-position/sticky/position-sticky-scrollIntoView-expected.txt (287566 => 287567)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-position/sticky/position-sticky-scrollIntoView-expected.txt	2022-01-04 15:27:18 UTC (rev 287566)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-position/sticky/position-sticky-scrollIntoView-expected.txt	2022-01-04 15:52:54 UTC (rev 287567)
@@ -5,5 +5,5 @@
 Title 3
 
 
-PASS scrolling a sticky element into view should use its unshifted position
+FAIL scrolling a sticky element into view should use its unshifted position assert_approx_equals: expected 1122 +/- 1 but got 561
 

Added: trunk/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/css/css-position/sticky/position-sticky-scrollIntoView-expected.txt (0 => 287567)


--- trunk/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/css/css-position/sticky/position-sticky-scrollIntoView-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/css/css-position/sticky/position-sticky-scrollIntoView-expected.txt	2022-01-04 15:52:54 UTC (rev 287567)
@@ -0,0 +1,9 @@
+Title 1
+
+Title 2
+
+Title 3
+
+
+FAIL scrolling a sticky element into view should use its unshifted position assert_approx_equals: expected 1120 +/- 1 but got 560
+

Modified: trunk/Source/WebCore/ChangeLog (287566 => 287567)


--- trunk/Source/WebCore/ChangeLog	2022-01-04 15:27:18 UTC (rev 287566)
+++ trunk/Source/WebCore/ChangeLog	2022-01-04 15:52:54 UTC (rev 287567)
@@ -1,3 +1,17 @@
+2022-01-04  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, reverting r283546.
+        https://bugs.webkit.org/show_bug.cgi?id=234844
+
+        Causes bad scrolling behavior on Discourse pages
+
+        Reverted changeset:
+
+        "[css-position-sticky] scrollIntoView should not take into
+        account sticky positioning offsets"
+        https://bugs.webkit.org/show_bug.cgi?id=230689
+        https://commits.webkit.org/r283546
+
 2022-01-04  Carlos Garcia Campos  <cgar...@igalia.com>
 
         [GTK][a11y] Take into account the active descendant when setting focus related states with ATSPI

Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (287566 => 287567)


--- trunk/Source/WebCore/rendering/RenderElement.cpp	2022-01-04 15:27:18 UTC (rev 287566)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp	2022-01-04 15:52:54 UTC (rev 287567)
@@ -1612,12 +1612,8 @@
 
 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(), localToAbsoluteMode, &insideFixed);
+        point = localToAbsolute(FloatPoint(), UseTransforms, &insideFixed);
         return true;
     }
 
@@ -1643,7 +1639,7 @@
         ASSERT(o);
 
         if (!o->isInline() || o->isReplaced()) {
-            point = o->localToAbsolute(FloatPoint(), localToAbsoluteMode, &insideFixed);
+            point = o->localToAbsolute(FloatPoint(), UseTransforms, &insideFixed);
             return true;
         }
 
@@ -1657,7 +1653,7 @@
                     point.move(textRenderer.linesBoundingBox().x(), run->line()->top());
             } else if (is<RenderBox>(*o))
                 point.moveBy(downcast<RenderBox>(*o).location());
-            point = o->container()->localToAbsolute(point, localToAbsoluteMode, &insideFixed);
+            point = o->container()->localToAbsolute(point, UseTransforms, &insideFixed);
             return true;
         }
     }
@@ -1673,12 +1669,8 @@
 
 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()), localToAbsoluteMode, &insideFixed);
+        point = localToAbsolute(LayoutPoint(downcast<RenderBox>(*this).size()), UseTransforms, &insideFixed);
         return true;
     }
 
@@ -1709,7 +1701,7 @@
                 point.moveBy(linesBox.maxXMaxYCorner());
             } else
                 point.moveBy(downcast<RenderBox>(*o).frameRect().maxXMaxYCorner());
-            point = o->container()->localToAbsolute(point, localToAbsoluteMode, &insideFixed);
+            point = o->container()->localToAbsolute(point, UseTransforms, &insideFixed);
             return true;
         }
     }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to