Title: [247616] branches/safari-608-branch/Source/WebKit
Revision
247616
Author
kocsen_ch...@apple.com
Date
2019-07-18 13:25:53 -0700 (Thu, 18 Jul 2019)

Log Message

Cherry-pick r247559. rdar://problem/53230035

    Early Out of positionInfomation check if possible
    https://bugs.webkit.org/show_bug.cgi?id=199885
    <rdar://problem/53229413>

    This is an early-out check that happens after most of the work is done.
    Move it to happen before we make all these calls, if in the end, we will not use the information.

    Reviewed by Tim Horton.

    * UIProcess/ios/WKContentViewInteraction.mm:
    (-[WKContentView textInteractionGesture:shouldBeginAtPoint:]):

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

Modified Paths

Diff

Modified: branches/safari-608-branch/Source/WebKit/ChangeLog (247615 => 247616)


--- branches/safari-608-branch/Source/WebKit/ChangeLog	2019-07-18 20:25:51 UTC (rev 247615)
+++ branches/safari-608-branch/Source/WebKit/ChangeLog	2019-07-18 20:25:53 UTC (rev 247616)
@@ -1,5 +1,38 @@
 2019-07-17  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Cherry-pick r247559. rdar://problem/53230035
+
+    Early Out of positionInfomation check if possible
+    https://bugs.webkit.org/show_bug.cgi?id=199885
+    <rdar://problem/53229413>
+    
+    This is an early-out check that happens after most of the work is done.
+    Move it to happen before we make all these calls, if in the end, we will not use the information.
+    
+    Reviewed by Tim Horton.
+    
+    * UIProcess/ios/WKContentViewInteraction.mm:
+    (-[WKContentView textInteractionGesture:shouldBeginAtPoint:]):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247559 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-07-17  Megan Gardner  <megan_gard...@apple.com>
+
+            Early Out of positionInfomation check if possible
+            https://bugs.webkit.org/show_bug.cgi?id=199885
+            <rdar://problem/53229413>
+
+            This is an early-out check that happens after most of the work is done.
+            Move it to happen before we make all these calls, if in the end, we will not use the information.
+
+            Reviewed by Tim Horton.
+
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView textInteractionGesture:shouldBeginAtPoint:]):
+
+2019-07-17  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r247547. rdar://problem/53230043
 
     Provide a NSURL cateogry to tell AppSSO Kerberos URLs

Modified: branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (247615 => 247616)


--- branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2019-07-18 20:25:51 UTC (rev 247615)
+++ branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2019-07-18 20:25:53 UTC (rev 247616)
@@ -2234,6 +2234,10 @@
 
     if (_suppressSelectionAssistantReasons)
         return NO;
+    
+    // Don't allow double tap text gestures in noneditable content.
+    if (!self.isFocusingElement && gesture == UIWKGestureDoubleTap)
+        return NO;
 
     WebKit::InteractionInformationRequest request(WebCore::roundedIntPoint(point));
     if (![self ensurePositionInformationIsUpToDate:request])
@@ -2254,10 +2258,6 @@
     // If we're currently focusing an editable element, only allow the selection to move within that focused element.
     if (self.isFocusingElement)
         return _positionInformation.nodeAtPositionIsFocusedElement;
-    
-    // Don't allow double tap text gestures in noneditable content.
-    if (gesture == UIWKGestureDoubleTap)
-        return NO;
 
     // If we're selecting something, don't activate highlight.
     if (gesture == UIWKGestureLoupe && [self hasSelectablePositionAtPoint:point])
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to