Changeset 246817 in webkit

Timestamp:

Jun 25, 2019 4:41:31 PM (5 years ago)

Author:

dbates@webkit.org

Message:

Non-editable text selections should be modifiable with hardware keyboard
​https://bugs.webkit.org/show_bug.cgi?id=199204
<rdar://problem/51651496>

Reviewed by Wenson Hsieh.

Source/WebKit:

UIKit changes are need for this to work, including <rdar://problem/48322899>.
Note that without these changes, -canPerformAction is never called for _move*
selectors.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView canPerformAction:withSender:]):

LayoutTests:

Add a test, skipped for now, until we have the fix for <rdar://problem/48322899>.

• editing/selection/ios/select-non-editable-text-using-keyboard-expected.txt: Added.
• editing/selection/ios/select-non-editable-text-using-keyboard.html: Added.
• platform/ios/TestExpectations:
• resources/ui-helper.js:

(window.UIHelper.callFunctionAndWaitForEvent): Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/ios/select-non-editable-text-using-keyboard-expected.txt (added)
• LayoutTests/editing/selection/ios/select-non-editable-text-using-keyboard.html (added)
• LayoutTests/platform/ios/TestExpectations (modified) (1 diff)
• LayoutTests/resources/ui-helper.js (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-06-25  Daniel Bates  <dabates@apple.com>
+
+        Non-editable text selections should be modifiable with hardware keyboard
+        https://bugs.webkit.org/show_bug.cgi?id=199204
+        <rdar://problem/51651496>
+
+        Reviewed by Wenson Hsieh.
+
+        Add a test, skipped for now, until we have the fix for <rdar://problem/48322899>.
+
+        * editing/selection/ios/select-non-editable-text-using-keyboard-expected.txt: Added.
+        * editing/selection/ios/select-non-editable-text-using-keyboard.html: Added.
+        * platform/ios/TestExpectations:
+        * resources/ui-helper.js:
+        (window.UIHelper.callFunctionAndWaitForEvent): Added.
+
 2019-06-25  Daniel Bates  <dabates@apple.com>
 

trunk/LayoutTests/platform/ios/TestExpectations

@@ -3252 +3252 @@
 # Was unskipped, but now has missing results in iOS . Skipping on iOS only.
 media/controls-after-reload.html [ Skip ]
+
+# FIXME: Unskip the following test once we have the fix for <rdar://problem/48322899>.
+editing/selection/ios/select-non-editable-text-using-keyboard.html [ Skip ]

trunk/LayoutTests/resources/ui-helper.js

@@ -900 +900 @@
     }
 
+    static callFunctionAndWaitForEvent(functionToCall, target, eventName)
+    {
+        return new Promise((resolve) => {
+            target.addEventListener(eventName, resolve, { once: true });
+            functionToCall();
+        });
+
+    }
+
     static callFunctionAndWaitForScrollToFinish(functionToCall, ...theArguments)
     {

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-25  Daniel Bates  <dabates@apple.com>
+
+        Non-editable text selections should be modifiable with hardware keyboard
+        https://bugs.webkit.org/show_bug.cgi?id=199204
+        <rdar://problem/51651496>
+
+        Reviewed by Wenson Hsieh.
+
+        UIKit changes are need for this to work, including <rdar://problem/48322899>.
+        Note that without these changes, -canPerformAction is never called for _move*
+        selectors.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView canPerformAction:withSender:]):
+
 2019-06-25  Daniel Bates  <dabates@apple.com>
 

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

@@ -2893 +2893 @@
     // These are UIKit IPI selectors. We don't want to forward them to the web view.
     auto editorState = _page->editorState();
-    if (action == @selector(_deleteByWord) || action == @selector(_deleteForwardAndNotify:) || action == @selector(_deleteToEndOfParagraph) || action == @selector(_deleteToStartOfLine)
-        || action == @selector(_moveDown:withHistory:) || action == @selector(_moveLeft:withHistory:) || action == @selector(_moveRight:withHistory:)
+    if (action == @selector(_moveDown:withHistory:) || action == @selector(_moveLeft:withHistory:) || action == @selector(_moveRight:withHistory:)
         || action == @selector(_moveToEndOfDocument:withHistory:) || action == @selector(_moveToEndOfLine:withHistory:) || action == @selector(_moveToEndOfParagraph:withHistory:)
         || action == @selector(_moveToEndOfWord:withHistory:) || action == @selector(_moveToStartOfDocument:withHistory:) || action == @selector(_moveToStartOfLine:withHistory:)
-        || action == @selector(_moveToStartOfParagraph:withHistory:) || action == @selector(_moveToStartOfWord:withHistory:) || action == @selector(_moveUp:withHistory:)
+        || action == @selector(_moveToStartOfParagraph:withHistory:) || action == @selector(_moveToStartOfWord:withHistory:) || action == @selector(_moveUp:withHistory:))
+        return YES;
+
+    if (action == @selector(_deleteByWord) || action == @selector(_deleteForwardAndNotify:) || action == @selector(_deleteToEndOfParagraph) || action == @selector(_deleteToStartOfLine)
         || action == @selector(_transpose))
         return editorState.isContentEditable;