Changeset 283465 in webkit

Timestamp:

Oct 3, 2021, 8:52:45 AM (5 years ago)

Author:

Simon Fraser

Message:

REGRESSION (r283335): rubber-banding no longer locks to an axis
​https://bugs.webkit.org/show_bug.cgi?id=231131

Reviewed by Tim Horton.

Source/WebCore:

r283335 introduced a bug where pulling down to rubber-band would result in sideways
motion even when the gesture was mostly vertical.

ScrollingEffectsController::modifyScrollDeltaForStretching() has some axis-locking behavior
that was broken by r283335, so restore the old behavior.

Test: fast/scrolling/mac/rubberband-axis-locking.html

• platform/mac/ScrollingEffectsController.mm:

(WebCore::ScrollingEffectsController::modifyScrollDeltaForStretching):
(WebCore::isHorizontalSide): Deleted.
(WebCore::isVerticalSide): Deleted.

LayoutTests:

• fast/scrolling/mac/rubberband-axis-locking-expected.txt: Added.
• fast/scrolling/mac/rubberband-axis-locking.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/scrolling/mac/rubberband-axis-locking-expected.txt (added)
• LayoutTests/fast/scrolling/mac/rubberband-axis-locking.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/mac/ScrollingEffectsController.mm (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-10-03  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r283335): rubber-banding no longer locks to an axis
+        https://bugs.webkit.org/show_bug.cgi?id=231131
+
+        Reviewed by Tim Horton.
+
+        * fast/scrolling/mac/rubberband-axis-locking-expected.txt: Added.
+        * fast/scrolling/mac/rubberband-axis-locking.html: Added.
+
 2021-10-02  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-03  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r283335): rubber-banding no longer locks to an axis
+        https://bugs.webkit.org/show_bug.cgi?id=231131
+
+        Reviewed by Tim Horton.
+
+        r283335 introduced a bug where pulling down to rubber-band would result in sideways
+        motion even when the gesture was mostly vertical.
+
+        ScrollingEffectsController::modifyScrollDeltaForStretching() has some axis-locking behavior
+        that was broken by r283335, so restore the old behavior.
+
+        Test: fast/scrolling/mac/rubberband-axis-locking.html
+
+        * platform/mac/ScrollingEffectsController.mm:
+        (WebCore::ScrollingEffectsController::modifyScrollDeltaForStretching):
+        (WebCore::isHorizontalSide): Deleted.
+        (WebCore::isVerticalSide): Deleted.
+
 2021-10-03  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/mac/ScrollingEffectsController.mm

@@ -114 +114 @@
 }
 
-static bool isHorizontalSide(std::optional<BoxSide> side)
-{
-    return side && (*side == BoxSide::Left || *side == BoxSide::Right);
-}
-
-static bool isVerticalSide(std::optional<BoxSide> side)
-{
-    return side && (*side == BoxSide::Top || *side == BoxSide::Bottom);
-}
-
 bool ScrollingEffectsController::handleWheelEvent(const PlatformWheelEvent& wheelEvent)
 {
@@ -245 +235 @@
     auto affectedSide = affectedSideOnDominantAxis(delta);
     if (isVerticallyStretched) {
-        if (!isHorizontallyStretched && isHorizontalSide(affectedSide) && m_client.isPinnedOnSide(*affectedSide)) {
+        if (!isHorizontallyStretched && affectedSide && m_client.isPinnedOnSide(*affectedSide)) {
             // Stretching only in the vertical.
             if (delta.height() && (fabsf(delta.width() / delta.height()) < rubberbandDirectionLockStretchRatio))
@@ -261 +251 @@
     if (isHorizontallyStretched) {
         // Stretching only in the horizontal.
-        if (isVerticalSide(affectedSide) && m_client.isPinnedOnSide(*affectedSide)) {
+        if (affectedSide && m_client.isPinnedOnSide(*affectedSide)) {
             if (delta.width() && (fabsf(delta.height() / delta.width()) < rubberbandDirectionLockStretchRatio))
                 delta.setHeight(0);