Title: [270353] trunk/Source/WebKit
Revision
270353
Author
[email protected]
Date
2020-12-02 10:56:09 -0800 (Wed, 02 Dec 2020)

Log Message

Entire image elements are sometimes selected after ending a image extraction interaction
https://bugs.webkit.org/show_bug.cgi?id=219435
<rdar://problem/71897557>

Reviewed by Megan Gardner.

If the image extraction interaction is currently active, regular text interactions may need to defer to these
image extraction interactions. See WebKitAdditions changes for more details.

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

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (270352 => 270353)


--- trunk/Source/WebKit/ChangeLog	2020-12-02 18:47:18 UTC (rev 270352)
+++ trunk/Source/WebKit/ChangeLog	2020-12-02 18:56:09 UTC (rev 270353)
@@ -1,5 +1,20 @@
 2020-12-02  Wenson Hsieh  <[email protected]>
 
+        Entire image elements are sometimes selected after ending a image extraction interaction
+        https://bugs.webkit.org/show_bug.cgi?id=219435
+        <rdar://problem/71897557>
+
+        Reviewed by Megan Gardner.
+
+        If the image extraction interaction is currently active, regular text interactions may need to defer to these
+        image extraction interactions. See WebKitAdditions changes for more details.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView hasSelectablePositionAtPoint:]):
+        (-[WKContentView textInteractionGesture:shouldBeginAtPoint:]):
+
+2020-12-02  Wenson Hsieh  <[email protected]>
+
         Context menu should be shown after a long timeout following image extraction
         https://bugs.webkit.org/show_bug.cgi?id=219415
         <rdar://problem/71872600>

Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (270352 => 270353)


--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2020-12-02 18:47:18 UTC (rev 270352)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2020-12-02 18:56:09 UTC (rev 270353)
@@ -2559,6 +2559,11 @@
     if (_suppressSelectionAssistantReasons)
         return NO;
 
+#if ENABLE(IMAGE_EXTRACTION)
+    if ([self _imageExtractionShouldPreventTextInteractionAtPoint:point])
+        return NO;
+#endif
+
     if (_inspectorNodeSearchEnabled)
         return NO;
 
@@ -2593,7 +2598,12 @@
 
     if (_suppressSelectionAssistantReasons)
         return NO;
-    
+
+#if ENABLE(IMAGE_EXTRACTION)
+    if ([self _imageExtractionShouldPreventTextInteractionAtPoint:point])
+        return NO;
+#endif
+
     if (!self.isFocusingElement) {
         if (gesture == UIWKGestureDoubleTap) {
             // Don't allow double tap text gestures in noneditable content.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to