REGRESSION: Touch events fail to dispatch to the page in all cases.
authortimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 28 Apr 2018 00:52:13 +0000 (00:52 +0000)
committertimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 28 Apr 2018 00:52:13 +0000 (00:52 +0000)
https://bugs.webkit.org/show_bug.cgi?id=185097
rdar://problem/39731995

Reviewed by Tim Horton.

* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView gestureRecognizer:shouldRecognizeSimultaneouslyWithGestureRecognizer:]):
Consult internal gesture recognizers, otherwise NO might get returned.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231126 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index 5222615..5cfcd0a 100644 (file)
@@ -1,3 +1,16 @@
+2018-04-27  Timothy Hatcher  <timothy@apple.com>
+
+        REGRESSION: Touch events fail to dispatch to the page in all cases.
+
+        https://bugs.webkit.org/show_bug.cgi?id=185097
+        rdar://problem/39731995
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView gestureRecognizer:shouldRecognizeSimultaneouslyWithGestureRecognizer:]):
+        Consult internal gesture recognizers, otherwise NO might get returned.
+
 2018-04-26  Ryosuke Niwa  <rniwa@webkit.org>
 
         PSON: Triggering a navigation to an invalid URL creates a new WebContent process
index 1381f70..0bb9a75 100644 (file)
@@ -1334,6 +1334,11 @@ static inline bool isSamePair(UIGestureRecognizer *a, UIGestureRecognizer *b, UI
 
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer*)otherGestureRecognizer
 {
+#if USE(APPLE_INTERNAL_SDK)
+    if ([self _internalGestureRecognizer:gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:otherGestureRecognizer])
+        return YES;
+#endif
+
     if (isSamePair(gestureRecognizer, otherGestureRecognizer, _highlightLongPressGestureRecognizer.get(), _longPressGestureRecognizer.get()))
         return YES;