Title: [256544] branches/safari-609.1.17.0-branch/Source/WebKit
- Revision
- 256544
- Author
- [email protected]
- Date
- 2020-02-13 14:52:22 -0800 (Thu, 13 Feb 2020)
Log Message
Cherry-pick r255625. rdar://problem/59299317
Add a WebKitAdditions hook to override the behavior of -[WKContentView gestureRecognizer:shouldReceiveTouch:]
https://bugs.webkit.org/show_bug.cgi?id=207162
<rdar://problem/59129739>
Reviewed by Tim Horton.
Allow an internal implementation of `-_allowGestureRecognizer:toReceiveTouch:` to prevent touches from being
routed to certain gesture recognizers, if necessary.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView gestureRecognizer:shouldReceiveTouch:]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255625 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609.1.17.0-branch/Source/WebKit/ChangeLog (256543 => 256544)
--- branches/safari-609.1.17.0-branch/Source/WebKit/ChangeLog 2020-02-13 22:52:19 UTC (rev 256543)
+++ branches/safari-609.1.17.0-branch/Source/WebKit/ChangeLog 2020-02-13 22:52:22 UTC (rev 256544)
@@ -1,5 +1,38 @@
2020-02-13 Russell Epstein <[email protected]>
+ Cherry-pick r255625. rdar://problem/59299317
+
+ Add a WebKitAdditions hook to override the behavior of -[WKContentView gestureRecognizer:shouldReceiveTouch:]
+ https://bugs.webkit.org/show_bug.cgi?id=207162
+ <rdar://problem/59129739>
+
+ Reviewed by Tim Horton.
+
+ Allow an internal implementation of `-_allowGestureRecognizer:toReceiveTouch:` to prevent touches from being
+ routed to certain gesture recognizers, if necessary.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView gestureRecognizer:shouldReceiveTouch:]):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255625 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-02-03 Wenson Hsieh <[email protected]>
+
+ Add a WebKitAdditions hook to override the behavior of -[WKContentView gestureRecognizer:shouldReceiveTouch:]
+ https://bugs.webkit.org/show_bug.cgi?id=207162
+ <rdar://problem/59129739>
+
+ Reviewed by Tim Horton.
+
+ Allow an internal implementation of `-_allowGestureRecognizer:toReceiveTouch:` to prevent touches from being
+ routed to certain gesture recognizers, if necessary.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView gestureRecognizer:shouldReceiveTouch:]):
+
+2020-02-13 Russell Epstein <[email protected]>
+
Cherry-pick r255603. rdar://problem/59299321
[iOS 13] Dragging on-screen volume control on a YouTube video selects text around the panel
Modified: branches/safari-609.1.17.0-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (256543 => 256544)
--- branches/safari-609.1.17.0-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-02-13 22:52:19 UTC (rev 256543)
+++ branches/safari-609.1.17.0-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-02-13 22:52:22 UTC (rev 256544)
@@ -1506,7 +1506,6 @@
#endif
if (gestureRecognizer == _touchActionLeftSwipeGestureRecognizer || gestureRecognizer == _touchActionRightSwipeGestureRecognizer || gestureRecognizer == _touchActionUpSwipeGestureRecognizer || gestureRecognizer == _touchActionDownSwipeGestureRecognizer) {
-
// We update the enabled state of the various swipe gesture recognizers such that if we have a unidirectional touch-action
// specified (only pan-x or only pan-y) we enable the two recognizers in the opposite axis to prevent scrolling from starting
// if the initial gesture is such a swipe. Since the recognizers are specified to use a single finger for recognition, we don't
@@ -1517,7 +1516,11 @@
return touchActions == WebCore::TouchAction::PanX;
}
+#if USE(APPLE_INTERNAL_SDK)
+ return [self _allowGestureRecognizer:gestureRecognizer toReceiveTouch:touch];
+#else
return YES;
+#endif
}
#pragma mark - WKTouchActionGestureRecognizerDelegate implementation
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
