Changeset 230850 in webkit

Timestamp:

Apr 20, 2018, 1:40:51 PM (7 years ago)

Author:

Megan Gardner

Message:

Fixes for failing tests associated with switching Text Selection Assistants
​https://bugs.webkit.org/show_bug.cgi?id=184806
<rdar://problem/39367905>

Reviewed by Beth Dakin and Wenson Hsieh.

The major fix is the disabling the double tap noneditable text selection gesture.
The other fixes are small tweaks that shouldn't even be run into with the fix to
the double tap gesture, but they are incorrect, so I am taking the opportunity to
fix them now, in case we run into them again.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView textInteractionGesture:shouldBeginAtPoint:]):
We should not be allowing a double tap text gestures in non-editable web content.
We didn't have one with the old assistant. Fortunately, this is easily disabled.
(-[WKContentView canPerformActionForWebView:withSender:]):
We should not allow the lookup action if we do not actually have a selection.
It is meaningless without one.
(-[WKContentView selectedTextRange]):
We should not return a selection to UIKit if all we have is caret selection
in non-editable content. We have this for selections on Mac, but UIKit does
not know how to properly handle this, and will have incorrect behavior if we
return a valid selection.

Location:

trunk

Files:

• LayoutTests/fast/events/touch/ios/double-tap-on-editable-and-noneditable-expected.txt (added)
• LayoutTests/fast/events/touch/ios/double-tap-on-editable-and-noneditable.html (added)
• LayoutTests/resources/basic-gestures.js (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (3 diffs)

trunk/LayoutTests/resources/basic-gestures.js

@@ -19 +19 @@
                 uiController.singleTapAtPoint(${x}, ${y}, () => { });
                 uiController.singleTapAtPoint(${x}, ${y}, () => { });
+            })();`, resolve);
+    });
+}
+
+function doubleTapAtPoint(x, y)
+{
+    return new Promise(resolve => {
+        testRunner.runUIScript(`
+            (function() {
+                uiController.doubleTapAtPoint(${x}, ${y}, function() {
+                    uiController.uiScriptComplete();
+                });
             })();`, resolve);
     });

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-04-20  Megan Gardner  <megan_gardner@apple.com>
+
+        Fixes for failing tests associated with switching Text Selection Assistants
+        https://bugs.webkit.org/show_bug.cgi?id=184806
+        <rdar://problem/39367905>
+
+        Reviewed by Beth Dakin and Wenson Hsieh.
+        
+        The major fix is the disabling the double tap noneditable text selection gesture.
+        The other fixes are small tweaks that shouldn't even be run into with the fix to 
+        the double tap gesture, but they are incorrect, so I am taking the opportunity to 
+        fix them now, in case we run into them again.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView textInteractionGesture:shouldBeginAtPoint:]):
+        We should not be allowing a double tap text gestures in non-editable web content.
+        We didn't have one with the old assistant. Fortunately, this is easily disabled.
+        (-[WKContentView canPerformActionForWebView:withSender:]):
+        We should not allow the lookup action if we do not actually have a selection.
+        It is meaningless without one.
+        (-[WKContentView selectedTextRange]):
+        We should not return a selection to UIKit if all we have is caret selection
+        in non-editable content. We have this for selections on Mac, but UIKit does
+        not know how to properly handle this, and will have incorrect behavior if we 
+        return a valid selection.
+
 2018-04-20  Timothy Hatcher  <timothy@apple.com>
 

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

@@ -1657 +1657 @@
     if (self.isAssistingNode)
         return _positionInformation.nodeAtPositionIsAssistedNode;
+    
+    // Don't allow double tap text gestures in noneditable content.
+    if (gesture == UIWKGestureDoubleTap)
+        return NO;
 
     // If we're selecting something, don't activate highlight.
@@ -2247 +2251 @@
 #endif
 
-        return YES;
+        return hasWebSelection || _page->editorState().selectionIsRange;
     }
 
@@ -3146 +3150 @@
     if (_page->editorState().selectionIsNone || _page->editorState().isMissingPostLayoutData)
         return nil;
+    // UIKit does not expect caret selections in noneditable content.
+    if (!_page->editorState().isContentEditable && !_page->editorState().selectionIsRange)
+        return nil;
+    
     auto& postLayoutEditorStateData = _page->editorState().postLayoutData();
     FloatRect startRect = postLayoutEditorStateData.caretRectAtStart;