Changeset 246879 in webkit

Timestamp:

Jun 27, 2019 6:32:33 AM (5 years ago)

Author:

Antti Koivisto

Message:

REGRESSION (touch-action): Can't scroll vertically when touching a horizontally-scrollable element on instagram.com
​https://bugs.webkit.org/show_bug.cgi?id=199268
<rdar://problem/52246473>

Reviewed by Antoine Quint.

Source/WebCore:

Test: pointerevents/ios/touch-action-region-manipulation.html

Having a restrictive touch-action value like 'pan-y' on on element and then having a descendant with
'touch-action: manipulation' computes to 'none'.

• css/StyleResolver.cpp:

(WebCore::computeEffectiveTouchActions):

For value 'manipulation' return the current effective value, similar to the reverse case above.
Set intersection should only be computed out of restrictive values (pan-x/pan-y/pinch-zoom/none).

LayoutTests:

• pointerevents/ios/touch-action-region-manipulation-expected.txt: Added.
• pointerevents/ios/touch-action-region-manipulation.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/pointerevents/ios/touch-action-region-manipulation-expected.txt (added)
• LayoutTests/pointerevents/ios/touch-action-region-manipulation.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleResolver.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-06-27  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION (touch-action): Can't scroll vertically when touching a horizontally-scrollable element on instagram.com
+        https://bugs.webkit.org/show_bug.cgi?id=199268
+        <rdar://problem/52246473>
+
+        Reviewed by Antoine Quint.
+
+        * pointerevents/ios/touch-action-region-manipulation-expected.txt: Added.
+        * pointerevents/ios/touch-action-region-manipulation.html: Added.
+
 2019-06-27  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-27  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION (touch-action): Can't scroll vertically when touching a horizontally-scrollable element on instagram.com
+        https://bugs.webkit.org/show_bug.cgi?id=199268
+        <rdar://problem/52246473>
+
+        Reviewed by Antoine Quint.
+
+        Test: pointerevents/ios/touch-action-region-manipulation.html
+
+        Having a restrictive touch-action value like 'pan-y' on on element and then having a descendant with
+        'touch-action: manipulation' computes to 'none'.
+
+        * css/StyleResolver.cpp:
+        (WebCore::computeEffectiveTouchActions):
+
+        For value 'manipulation' return the current effective value, similar to the reverse case above.
+        Set intersection should only be computed out of restrictive values (pan-x/pan-y/pinch-zoom/none).
+
 2019-06-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -857 +857 @@
         return { TouchAction::None };
 
-    if (effectiveTouchActions.contains(TouchAction::Auto) || effectiveTouchActions.contains(TouchAction::Manipulation))
+    if (effectiveTouchActions.containsAny({ TouchAction::Auto, TouchAction::Manipulation }))
         return touchActions;
+
+    if (touchActions.containsAny({ TouchAction::Auto, TouchAction::Manipulation }))
+        return effectiveTouchActions;
 
     auto sharedTouchActions = effectiveTouchActions & touchActions;