Changeset 238033 in webkit

Timestamp:

Nov 9, 2018 9:06:50 AM (5 years ago)

Author:

dbates@webkit.org

Message:

[iOS] Pressing forward delete key in text field does nothing and we should not invoke an editor
action when forward delete is pressed outside a text field
​https://bugs.webkit.org/show_bug.cgi?id=190566
<rdar://problem/45262367>

Reviewed by Wenson Hsieh.

Source/WebKit:

Override -_deleteForwardAndNotify to perform a forward deletion and remove the dead code that
expected UIKit to send us a character string with 0xF728 for the forward delete key. UIKit
ceased doing this many years ago. We may revist this decision once <rdar://problem/45772078>
is fixed.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView _interpretKeyEvent:isCharEvent:]):
(-[WKContentView _deleteForwardAndNotify:]):

Source/WebKitLegacy/mac:

Remove dead code. UIKit ceased sending us a character string with 0xF728 for the forward delete
key many years ago. We will need to fix up iOS Legacy WebKit support for the forward delete key
in UIKit. We may revist this decision once <rdar://problem/45772078> is fixed.

• WebView/WebHTMLView.mm:

(-[WebHTMLView _handleEditingKeyEvent:]):

LayoutTests:

Add a test to ensure that pressing the forward delete key deletes the next character.

• fast/events/ios/forward-delete-in-editable-expected.txt: Added.
• fast/events/ios/forward-delete-in-editable.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/ios/forward-delete-in-editable-expected.txt (added)
• LayoutTests/fast/events/ios/forward-delete-in-editable.html (added)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (3 diffs)
• Source/WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-11-09  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Pressing forward delete key in text field does nothing and we should not invoke an editor
+        action when forward delete is pressed outside a text field
+        https://bugs.webkit.org/show_bug.cgi?id=190566
+        <rdar://problem/45262367>
+
+        Reviewed by Wenson Hsieh.
+
+        Add a test to ensure that pressing the forward delete key deletes the next character.
+
+        * fast/events/ios/forward-delete-in-editable-expected.txt: Added.
+        * fast/events/ios/forward-delete-in-editable.html: Added.
+
 2018-11-09  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-11-09  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Pressing forward delete key in text field does nothing and we should not invoke an editor
+        action when forward delete is pressed outside a text field
+        https://bugs.webkit.org/show_bug.cgi?id=190566
+        <rdar://problem/45262367>
+
+        Reviewed by Wenson Hsieh.
+
+        Override -_deleteForwardAndNotify to perform a forward deletion and remove the dead code that
+        expected UIKit to send us a character string with 0xF728 for the forward delete key. UIKit
+        ceased doing this many years ago. We may revist this decision once <rdar://problem/45772078>
+        is fixed.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _interpretKeyEvent:isCharEvent:]):
+        (-[WKContentView _deleteForwardAndNotify:]):
+
 2018-11-08  Wenson Hsieh  <wenson_hsieh@apple.com>
 

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

@@ -3824 +3824 @@
     static const unsigned kWebReturnKey = 0x000D;
     static const unsigned kWebDeleteKey = 0x007F;
-    static const unsigned kWebDeleteForwardKey = 0xF728;
     static const unsigned kWebSpaceKey = 0x20;
 
@@ -3869 +3868 @@
         break;
 
-    case kWebDeleteForwardKey:
-        _page->executeEditCommand("deleteForward"_s);
-        return YES;
-
     default:
         if (contentEditable && isCharEvent) {
@@ -3941 +3936 @@
 {
     [self executeEditCommandWithCallback:@"deleteToEndOfLine"];
+}
+
+- (void)_deleteForwardAndNotify:(BOOL)notify
+{
+    [self executeEditCommandWithCallback:@"deleteForward"];
 }
 

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2018-11-09  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Pressing forward delete key in text field does nothing and we should not invoke an editor
+        action when forward delete is pressed outside a text field
+        https://bugs.webkit.org/show_bug.cgi?id=190566
+        <rdar://problem/45262367>
+
+        Reviewed by Wenson Hsieh.
+
+        Remove dead code. UIKit ceased sending us a character string with 0xF728 for the forward delete
+        key many years ago. We will need to fix up iOS Legacy WebKit support for the forward delete key
+        in UIKit. We may revist this decision once <rdar://problem/45772078> is fixed.
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _handleEditingKeyEvent:]):
+
 2018-11-08  Megan Gardner  <megan_gardner@apple.com>
 

trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm

@@ -6055 +6055 @@
 #define kWebReturnKey        0x000d
 #define kWebDeleteKey        0x007F
-#define kWebDeleteForwardKey 0xF728
     
 - (BOOL)_handleEditingKeyEvent:(KeyboardEvent *)wcEvent
@@ -6090 +6089 @@
             }
             break;
-        case kWebDeleteForwardKey:
-            [self deleteForward:self];
-            return YES;
         default:
             if (platformEvent->type() == PlatformKeyboardEvent::Char) {