Changeset 247206 in webkit

Timestamp:

Jul 8, 2019 4:26:24 AM (5 years ago)

Author:

graouts@webkit.org

Message:

[Pointer Events] touch-action should affect the behavior of pinch-to-zoom to show tabs in Safari
​https://bugs.webkit.org/show_bug.cgi?id=199560
<rdar://problem/52742265>

Reviewed by Dean Jackson.

There are other UIPinchGestureRecognizer objects that may lead to pinch-to-zoom behavior, for instance pinching
out to show open tabs in Safari on iOS. We add a new WKUIDelegatePrivate method that will allow Safari to indicate
that a UIPinchGestureRecognizer considered for prevention would lead to pinch-to-zoom behavior.

• UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView gestureRecognizerMayPinchToZoomWebView:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKUIDelegatePrivate.h (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-07  Antoine Quint  <graouts@apple.com>
+
+        [Pointer Events] touch-action should affect the behavior of pinch-to-zoom to show tabs in Safari
+        https://bugs.webkit.org/show_bug.cgi?id=199560
+        <rdar://problem/52742265>
+
+        Reviewed by Dean Jackson.
+
+        There are other UIPinchGestureRecognizer objects that may lead to pinch-to-zoom behavior, for instance pinching
+        out to show open tabs in Safari on iOS. We add a new WKUIDelegatePrivate method that will allow Safari to indicate
+        that a UIPinchGestureRecognizer considered for prevention would lead to pinch-to-zoom behavior.
+
+        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView gestureRecognizerMayPinchToZoomWebView:]):
+
 2019-07-08  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h

@@ -187 +187 @@
 - (void)_webView:(WKWebView *)webView didPresentFocusedElementViewController:(UIViewController *)controller WK_API_AVAILABLE(ios(12.0));
 - (void)_webView:(WKWebView *)webView didDismissFocusedElementViewController:(UIViewController *)controller WK_API_AVAILABLE(ios(12.0));
+- (BOOL)_webView:(WKWebView *)webView gestureRecognizerCouldPinch:(UIGestureRecognizer *)gestureRecognizer WK_API_AVAILABLE(ios(13.0));
 
 /*! @abstract Allows your app to determine whether or not the given security origin should have access to the device's orientation and motion.

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

@@ -1391 +1391 @@
 {
     // The gesture recognizer is the main UIScrollView's UIPinchGestureRecognizer.
-    return gestureRecognizer == [_webView scrollView].pinchGestureRecognizer;
+    if (gestureRecognizer == [_webView scrollView].pinchGestureRecognizer)
+        return YES;
+
+    // The gesture recognizer is another UIPichGestureRecognizer known to lead to pinch-to-zoom.
+    if ([gestureRecognizer isKindOfClass:[UIPinchGestureRecognizer class]]) {
+        if (auto uiDelegate = static_cast<id<WKUIDelegatePrivate>>(_webView.UIDelegate)) {
+            if ([uiDelegate respondsToSelector:@selector(_webView:gestureRecognizerCouldPinch:)])
+                return [uiDelegate _webView:_webView gestureRecognizerCouldPinch:gestureRecognizer];
+        }
+    }
+    return NO;
 }