Changeset 211121 in webkit

Timestamp:

Jan 24, 2017, 4:49:33 PM (10 years ago)

Author:

timothy_horton@apple.com

Message:

Script gets touch events even after navigation swipe begins
​https://bugs.webkit.org/show_bug.cgi?id=167383
<rdar://problem/22938927>

Reviewed by Simon Fraser.

• Platform/spi/ios/UIKitSPI.h:
• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _isNavigationSwipeGestureRecognizer:]):

• UIProcess/API/Cocoa/WKWebViewInternal.h:
• UIProcess/Cocoa/ViewGestureController.h:
• UIProcess/ios/ViewGestureControllerIOS.mm:

(-[WKSwipeTransitionController isNavigationSwipeGestureRecognizer:]):
(WebKit::ViewGestureController::isNavigationSwipeGestureRecognizer):

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView gestureRecognizer:shouldRequireFailureOfGestureRecognizer:]):
Require the navigation swipe gesture recognizer to fail before the
UIWebTouchEventsGestureRecognizer can recognize. This way, the page
doesn't get touch events during the swipe, which previously led to
e.g. carousels scrolling while swiping.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/UIKitSPI.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebViewInternal.h (modified) (1 diff)
• UIProcess/Cocoa/ViewGestureController.h (modified) (2 diffs)
• UIProcess/ios/ViewGestureControllerIOS.mm (modified) (2 diffs)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-01-24  Tim Horton  <timothy_horton@apple.com>
+
+        Script gets touch events even after navigation swipe begins
+        https://bugs.webkit.org/show_bug.cgi?id=167383
+        <rdar://problem/22938927>
+
+        Reviewed by Simon Fraser.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _isNavigationSwipeGestureRecognizer:]):
+        * UIProcess/API/Cocoa/WKWebViewInternal.h:
+        * UIProcess/Cocoa/ViewGestureController.h:
+        * UIProcess/ios/ViewGestureControllerIOS.mm:
+        (-[WKSwipeTransitionController isNavigationSwipeGestureRecognizer:]):
+        (WebKit::ViewGestureController::isNavigationSwipeGestureRecognizer):
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView gestureRecognizer:shouldRequireFailureOfGestureRecognizer:]):
+        Require the navigation swipe gesture recognizer to fail before the
+        UIWebTouchEventsGestureRecognizer can recognize. This way, the page
+        doesn't get touch events during the swipe, which previously led to
+        e.g. carousels scrolling while swiping.
+
 2017-01-24  Matt Rajca  <mrajca@apple.com>
 

trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h

@@ -743 +743 @@
 @interface _UINavigationInteractiveTransitionBase ()
 - (id)initWithGestureRecognizerView:(UIView *)gestureRecognizerView animator:(id<UIViewControllerAnimatedTransitioning>)animator delegate:(id<_UINavigationInteractiveTransitionBaseDelegate>)delegate;
+@property (nonatomic, weak) UIPanGestureRecognizer *gestureRecognizer;
 @property (nonatomic, assign) BOOL shouldReverseTranslation;
 @property (nonatomic, retain) _UINavigationParallaxTransition *animationController;

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -2303 +2303 @@
 {
     return _allowsBackForwardNavigationGestures;
+}
+
+- (BOOL)_isNavigationSwipeGestureRecognizer:(UIGestureRecognizer *)recognizer
+{
+    if (!_gestureController)
+        return NO;
+    return _gestureController->isNavigationSwipeGestureRecognizer(recognizer);
 }
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h

@@ -115 +115 @@
 - (void)_navigationGestureDidBegin;
 - (void)_navigationGestureDidEnd;
+- (BOOL)_isNavigationSwipeGestureRecognizer:(UIGestureRecognizer *)recognizer;
 
 @property (nonatomic, readonly) BOOL _isBackground;

trunk/Source/WebKit2/UIProcess/Cocoa/ViewGestureController.h

@@ -40 +40 @@
 
 #if PLATFORM(IOS)
+OBJC_CLASS UIGestureRecognizer;
 OBJC_CLASS UIView;
 OBJC_CLASS WKSwipeTransitionController;
@@ -106 +107 @@
     bool isPhysicallySwipingLeft(SwipeDirection) const;
 #else
+    bool isNavigationSwipeGestureRecognizer(UIGestureRecognizer *) const;
     void installSwipeHandler(UIView *gestureRecognizerView, UIView *swipingView);
     void beginSwipeGesture(_UINavigationInteractiveTransitionBase *, SwipeDirection);

trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm

@@ -130 +130 @@
 }
 
+- (BOOL)isNavigationSwipeGestureRecognizer:(UIGestureRecognizer *)recognizer
+{
+    return recognizer == [_backTransitionController gestureRecognizer] || recognizer == [_forwardTransitionController gestureRecognizer];
+}
+
 @end
 
@@ -140 +145 @@
     [m_swipeTransitionContext _setAnimator:nil];
     [m_swipeInteractiveTransitionDelegate invalidate];
+}
+
+bool ViewGestureController::isNavigationSwipeGestureRecognizer(UIGestureRecognizer *recognizer) const
+{
+    return [m_swipeInteractiveTransitionDelegate isNavigationSwipeGestureRecognizer:recognizer];
 }
 

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

@@ -1189 +1189 @@
 
     if (isSamePair(gestureRecognizer, otherGestureRecognizer, _highlightLongPressGestureRecognizer.get(), _previewGestureRecognizer.get()))
+        return YES;
+
+    return NO;
+}
+
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRequireFailureOfGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
+{
+    if (gestureRecognizer == _touchEventGestureRecognizer && [_webView _isNavigationSwipeGestureRecognizer:otherGestureRecognizer])
         return YES;