Changeset 247265 in webkit

Timestamp:

Jul 9, 2019 11:43:57 AM (5 years ago)

Author:

graouts@webkit.org

Message:

[Pointer Events] Scroll indicators should not show for scrollable content with touch-action: none
​https://bugs.webkit.org/show_bug.cgi?id=199618

Reviewed by Simon Fraser.

Source/WebKit:

Even though we correctly didn't scroll when "touch-action: none" was specified on an element, we would only apply
scrolling constraints after the panning gesture was recognized and the backing UIScrollView would show its scroll
indicators. While this is correct when only "pan-x" or "pan-y" is specified, we should not show the scroll indicators
at all for "touch-action: none" since no scrolling should happen.

To do this, we add a new method to the WKTouchActionGestureRecognizerDelegate protocol to indicate whether a given
gesture recognizer may pan content in the WKWebView. If the gesture recognizer is the top-level scroll view or one
created within the page to back "overflow: scroll" content or an iframe, we correctly make that gesture recognizer
fail to recognize if neither "pan-x" nor "pan-y" is specified for this touch identifier.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView gestureRecognizerMayPanWebView:]):

• UIProcess/ios/WKTouchActionGestureRecognizer.h:
• UIProcess/ios/WKTouchActionGestureRecognizer.mm:

(-[WKTouchActionGestureRecognizer canPreventGestureRecognizer:]):

LayoutTests:

Add a new test that swipes "overflow: scroll" content which would show scroll indicators without scrolling
prior to this patch.

• pointerevents/ios/touch-action-none-no-scroll-indicators-expected.html: Added.
• pointerevents/ios/touch-action-none-no-scroll-indicators.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/pointerevents/ios/touch-action-none-no-scroll-indicators-expected.html (added)
• LayoutTests/pointerevents/ios/touch-action-none-no-scroll-indicators.html (added)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKTouchActionGestureRecognizer.h (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKTouchActionGestureRecognizer.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-07-09  Antoine Quint  <graouts@apple.com>
+
+        [Pointer Events] Scroll indicators should not show for scrollable content with touch-action: none
+        https://bugs.webkit.org/show_bug.cgi?id=199618
+
+        Reviewed by Simon Fraser.
+
+        Add a new test that swipes "overflow: scroll" content which would show scroll indicators without scrolling
+        prior to this patch.
+
+        * pointerevents/ios/touch-action-none-no-scroll-indicators-expected.html: Added.
+        * pointerevents/ios/touch-action-none-no-scroll-indicators.html: Added.
+
 2019-07-09  Charlie Turner  <cturner@igalia.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-09  Antoine Quint  <graouts@apple.com>
+
+        [Pointer Events] Scroll indicators should not show for scrollable content with touch-action: none
+        https://bugs.webkit.org/show_bug.cgi?id=199618
+
+        Reviewed by Simon Fraser.
+
+        Even though we correctly didn't scroll when "touch-action: none" was specified on an element, we would only apply
+        scrolling constraints after the panning gesture was recognized and the backing UIScrollView would show its scroll
+        indicators. While this is correct when only "pan-x" or "pan-y" is specified, we should not show the scroll indicators
+        at all for "touch-action: none" since no scrolling should happen.
+
+        To do this, we add a new method to the WKTouchActionGestureRecognizerDelegate protocol to indicate whether a given
+        gesture recognizer may pan content in the WKWebView. If the gesture recognizer is the top-level scroll view or one
+        created within the page to back "overflow: scroll" content or an iframe, we correctly make that gesture recognizer
+        fail to recognize if neither "pan-x" nor "pan-y" is specified for this touch identifier.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView gestureRecognizerMayPanWebView:]):
+        * UIProcess/ios/WKTouchActionGestureRecognizer.h:
+        * UIProcess/ios/WKTouchActionGestureRecognizer.mm:
+        (-[WKTouchActionGestureRecognizer canPreventGestureRecognizer:]):
+
 2019-07-09  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -1388 +1388 @@
 #pragma mark - WKTouchActionGestureRecognizerDelegate implementation
 
+- (BOOL)gestureRecognizerMayPanWebView:(UIGestureRecognizer *)gestureRecognizer
+{
+    // The gesture recognizer is the main UIScrollView's UIPanGestureRecognizer.
+    if (gestureRecognizer == [_webView scrollView].panGestureRecognizer)
+        return YES;
+
+    // The gesture recognizer is a child UIScrollView's UIPanGestureRecognizer created by WebKit.
+    if (gestureRecognizer.view && [gestureRecognizer.view isKindOfClass:[WKChildScrollView class]])
+        return YES;
+
+    return NO;
+}
+
 - (BOOL)gestureRecognizerMayPinchToZoomWebView:(UIGestureRecognizer *)gestureRecognizer
 {

trunk/Source/WebKit/UIProcess/ios/WKTouchActionGestureRecognizer.h

@@ -39 +39 @@
 
 @protocol WKTouchActionGestureRecognizerDelegate <NSObject>
+- (BOOL)gestureRecognizerMayPanWebView:(UIGestureRecognizer *)gestureRecognizer;
 - (BOOL)gestureRecognizerMayPinchToZoomWebView:(UIGestureRecognizer *)gestureRecognizer;
 - (BOOL)gestureRecognizerMayDoubleTapToZoomWebView:(UIGestureRecognizer *)gestureRecognizer;

trunk/Source/WebKit/UIProcess/ios/WKTouchActionGestureRecognizer.mm

@@ -92 +92 @@
         return NO;
 
+    auto mayPan = [_touchActionDelegate gestureRecognizerMayPanWebView:preventedGestureRecognizer];
     auto mayPinchToZoom = [_touchActionDelegate gestureRecognizerMayPinchToZoomWebView:preventedGestureRecognizer];
     auto mayDoubleTapToZoom = [_touchActionDelegate gestureRecognizerMayDoubleTapToZoomWebView:preventedGestureRecognizer];
 
-    if (!mayPinchToZoom && !mayDoubleTapToZoom)
+    if (!mayPan && !mayPinchToZoom && !mayDoubleTapToZoom)
         return NO;
 
@@ -106 +107 @@
         auto iterator = _touchActionsByTouchIdentifier.find([touchIdentifier unsignedIntegerValue]);
         if (iterator != _touchActionsByTouchIdentifier.end() && [[activeTouches objectForKey:touchIdentifier].gestureRecognizers containsObject:preventedGestureRecognizer]) {
+            // Panning is only allowed if "pan-x", "pan-y" or "manipulation" is specified. Additional work is needed to respect individual values, but this takes
+            // care of the case where no panning is allowed.
+            if (mayPan && !iterator->value.containsAny({ WebCore::TouchAction::PanX, WebCore::TouchAction::PanY, WebCore::TouchAction::Manipulation }))
+                return YES;
             // Pinch-to-zoom is only allowed if "pinch-zoom" or "manipulation" is specified.
             if (mayPinchToZoom && !iterator->value.containsAny({ WebCore::TouchAction::PinchZoom, WebCore::TouchAction::Manipulation }))