Changeset 278868 in webkit

Timestamp:

Jun 15, 2021 4:09:34 AM (13 months ago)

Author:

commit-queue@webkit.org

Message:

[css-scroll-snap] Scroll snap offsets are interpreted as scroll positions in ScrollableArea
​https://bugs.webkit.org/show_bug.cgi?id=226572

Patch by Martin Robinson <​mrobinson@igalia.com> on 2021-06-15
Reviewed by Simon Fraser.

Source/WebCore:

Test: css3/scroll-snap/scroll-snap-right-to-left-initial-snapping.html

This is also covered by existing WPT tests, but these tests are composite reference
tests where there are still some failing elements.

• platform/ScrollableArea.cpp:

(WebCore::ScrollableArea::nearestActiveSnapPoint): Use scroll offsets instead of positions.
(WebCore::ScrollableArea::updateScrollSnapState): Ditto.

LayoutTests:

• TestExpectations: Mark test as newly passing.
• css3/scroll-snap/scroll-snap-right-to-left-initial-snapping-expected.txt: Added.
• css3/scroll-snap/scroll-snap-right-to-left-initial-snapping.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/css3/scroll-snap/scroll-snap-right-to-left-initial-snapping-expected.txt (added)
• LayoutTests/css3/scroll-snap/scroll-snap-right-to-left-initial-snapping.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/ScrollableArea.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-06-15  Martin Robinson  <mrobinson@igalia.com>
+
+        [css-scroll-snap] Scroll snap offsets are interpreted as scroll positions in ScrollableArea
+        https://bugs.webkit.org/show_bug.cgi?id=226572
+
+        Reviewed by Simon Fraser.
+
+        * TestExpectations: Mark test as newly passing.
+        * css3/scroll-snap/scroll-snap-right-to-left-initial-snapping-expected.txt: Added.
+        * css3/scroll-snap/scroll-snap-right-to-left-initial-snapping.html: Added.
+
 2021-06-15  Enrique Ocaña González  <eocanha@igalia.com>
 

trunk/LayoutTests/TestExpectations

@@ -4554 +4554 @@
 imported/w3c/web-platform-tests/css/css-scroll-snap/scroll-target-snap-001.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-scroll-snap/scroll-target-snap-002.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/direction-rtl.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000.html [ ImageOnlyFailure ]
 webkit.org/b/218325 imported/w3c/web-platform-tests/css/css-scroll-snap/scroll-target-margin-001.html [ Pass ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-15  Martin Robinson  <mrobinson@igalia.com>
+
+        [css-scroll-snap] Scroll snap offsets are interpreted as scroll positions in ScrollableArea
+        https://bugs.webkit.org/show_bug.cgi?id=226572
+
+        Reviewed by Simon Fraser.
+
+        Test: css3/scroll-snap/scroll-snap-right-to-left-initial-snapping.html
+
+        This is also covered by existing WPT tests, but these tests are composite reference
+        tests where there are still some failing elements.
+
+        * platform/ScrollableArea.cpp:
+        (WebCore::ScrollableArea::nearestActiveSnapPoint): Use scroll offsets instead of positions.
+        (WebCore::ScrollableArea::updateScrollSnapState): Ditto.
+
 2021-05-31  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/platform/ScrollableArea.cpp

@@ -529 +529 @@
         return;
 
-    IntPoint currentPosition = scrollPosition();
-    IntPoint correctedPosition = currentPosition;
+    auto currentOffset = scrollOffset();
+    auto correctedOffset = currentOffset;
     const auto& horizontal = info->horizontalSnapOffsets;
     auto activeHorizontalIndex = currentHorizontalSnapPointIndex();
     if (activeHorizontalIndex < horizontal.size())
-        correctedPosition.setX(horizontal[activeHorizontalIndex].offset.toInt());
+        correctedOffset.setX(horizontal[activeHorizontalIndex].offset.toInt());
 
     const auto& vertical = info->verticalSnapOffsets;
     auto activeVerticalIndex = currentVerticalSnapPointIndex();
     if (activeVerticalIndex < vertical.size())
-        correctedPosition.setY(vertical[activeVerticalIndex].offset.toInt());
-
-    if (correctedPosition != currentPosition) {
-        LOG_WITH_STREAM(ScrollSnap, stream << " adjusting position from " << currentPosition << " to " << correctedPosition);
-        scrollToPositionWithoutAnimation(correctedPosition);
+        correctedOffset.setY(vertical[activeVerticalIndex].offset.toInt());
+
+    if (correctedOffset != currentOffset) {
+        LOG_WITH_STREAM(ScrollSnap, stream << " adjusting offset from " << currentOffset << " to " << correctedOffset);
+        scrollToOffsetWithoutAnimation(correctedOffset);
     }
 }