Changeset 243351 in webkit

Timestamp:

Mar 21, 2019 6:03:18 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Long press gesture recognizers in WKWebView are conflicting with internal scroll view long press gesture recognizers
​https://bugs.webkit.org/show_bug.cgi?id=195726
rdar://problem/48582449

Patch by James Magahern <​jmagahern@apple.com> on 2019-03-21
Reviewed by Megan Gardner.

We just need to add another clause to WKContentViewInteraction's
canPreventGestureRecognizer whitelist.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView gestureRecognizer:canPreventGestureRecognizer:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-21  James Magahern  <jmagahern@apple.com>
+
+        Long press gesture recognizers in WKWebView are conflicting with internal scroll view long press gesture recognizers
+        https://bugs.webkit.org/show_bug.cgi?id=195726
+        rdar://problem/48582449
+
+        Reviewed by Megan Gardner.
+
+        We just need to add another clause to WKContentViewInteraction's
+        canPreventGestureRecognizer whitelist. 
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView gestureRecognizer:canPreventGestureRecognizer:]):
+
 2019-03-21  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -1687 +1687 @@
 }
 
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKContentViewInteraction.mm>)
+#include <WebKitAdditions/WKContentViewInteraction.mm>
+#else
+
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)preventingGestureRecognizer canPreventGestureRecognizer:(UIGestureRecognizer *)preventedGestureRecognizer
 {
@@ -1695 +1699 @@
         && ([preventedGestureRecognizer isKindOfClass:NSClassFromString(@"UIScrollViewPanGestureRecognizer")] || [preventedGestureRecognizer isKindOfClass:NSClassFromString(@"UIScrollViewPinchGestureRecognizer")]));
 }
+
+#endif
 
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)preventedGestureRecognizer canBePreventedByGestureRecognizer:(UIGestureRecognizer *)preventingGestureRecognizer {