Title: [257030] branches/safari-609-branch/Source/WebKit
Revision
257030
Author
alanc...@apple.com
Date
2020-02-19 18:59:46 -0800 (Wed, 19 Feb 2020)

Log Message

Cherry-pick r256790. rdar://problem/59576023

    Data detectors do not trigger on macCatalyst
    https://bugs.webkit.org/show_bug.cgi?id=207860
    <rdar://problem/59038913>

    Reviewed by Tim Horton.

    The lookup gesture which run data detection needs touch information to function. Allow touches to be sent to the gesture.

    * UIProcess/ios/WKContentViewInteraction.mm:
    (-[WKContentView gestureRecognizer:shouldReceiveTouch:]):

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

Modified Paths

Diff

Modified: branches/safari-609-branch/Source/WebKit/ChangeLog (257029 => 257030)


--- branches/safari-609-branch/Source/WebKit/ChangeLog	2020-02-20 02:43:58 UTC (rev 257029)
+++ branches/safari-609-branch/Source/WebKit/ChangeLog	2020-02-20 02:59:46 UTC (rev 257030)
@@ -1,3 +1,34 @@
+2020-02-19  Russell Epstein  <repst...@apple.com>
+
+        Cherry-pick r256790. rdar://problem/59576023
+
+    Data detectors do not trigger on macCatalyst
+    https://bugs.webkit.org/show_bug.cgi?id=207860
+    <rdar://problem/59038913>
+    
+    Reviewed by Tim Horton.
+    
+    The lookup gesture which run data detection needs touch information to function. Allow touches to be sent to the gesture.
+    
+    * UIProcess/ios/WKContentViewInteraction.mm:
+    (-[WKContentView gestureRecognizer:shouldReceiveTouch:]):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256790 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-02-17  Megan Gardner  <megan_gard...@apple.com>
+
+            Data detectors do not trigger on macCatalyst
+            https://bugs.webkit.org/show_bug.cgi?id=207860
+            <rdar://problem/59038913>
+
+            Reviewed by Tim Horton.
+
+            The lookup gesture which run data detection needs touch information to function. Allow touches to be sent to the gesture.
+
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView gestureRecognizer:shouldReceiveTouch:]):
+
 2020-02-18  Alan Coon  <alanc...@apple.com>
 
         Cherry-pick r256191. rdar://problem/59447003

Modified: branches/safari-609-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (257029 => 257030)


--- branches/safari-609-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2020-02-20 02:43:58 UTC (rev 257029)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2020-02-20 02:59:46 UTC (rev 257030)
@@ -1514,7 +1514,7 @@
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch
 {
 #if HAVE(HOVER_GESTURE_RECOGNIZER)
-    if (gestureRecognizer != _mouseGestureRecognizer && [_mouseGestureRecognizer mouseTouch] == touch)
+    if (gestureRecognizer != _lookupGestureRecognizer && (gestureRecognizer != _mouseGestureRecognizer && [_mouseGestureRecognizer mouseTouch] == touch))
         return NO;
 #endif
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to