Changeset 187266 in webkit

Timestamp:

Jul 23, 2015, 4:06:44 PM (10 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/21910578> Second pass at [iOS] Keyboard shortcuts that take focus away from the web view end up typing a letter into the newly focused field
​https://bugs.webkit.org/show_bug.cgi?id=146732

Reviewed by Darin Adler.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView _interpretKeyEvent:isCharEvent:]): Rather than checking if the view is
first responder, which it might still be when the Web Content processes invokes this
callback, check if we are in editable content before forwarding the event to the keyboard.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog ¶

@@ +1 @@
+2015-07-23  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/21910578> Second pass at [iOS] Keyboard shortcuts that take focus away from the web view end up typing a letter into the newly focused field
+        https://bugs.webkit.org/show_bug.cgi?id=146732
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _interpretKeyEvent:isCharEvent:]): Rather than checking if the view is
+        first responder, which it might still be when the Web Content processes invokes this
+        callback, check if we are in editable content before forwarding the event to the keyboard.
+
 2015-07-23  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm ¶

@@ -2650 +2650 @@
     static const unsigned kWebSpaceKey = 0x20;
 
-    if (!self.isFirstResponder)
-        return NO;
-
-    if (!_page->editorState().isContentEditable && event.isTabKey)
+    BOOL contentEditable = _page->editorState().isContentEditable;
+
+    if (!contentEditable && event.isTabKey)
         return NO;
 
@@ -2702 +2701 @@
     case kWebBackspaceKey:
     case kWebDeleteKey:
-        // FIXME: remove deleteFromInput once UIKit adopts deleteFromInputWithFlags
-        if ([keyboard respondsToSelector:@selector(deleteFromInputWithFlags:)])
-            [keyboard deleteFromInputWithFlags:event.keyboardFlags];
-        else
-            [keyboard deleteFromInput];
-        return YES;
+        if (contentEditable) {
+            // FIXME: remove deleteFromInput once UIKit adopts deleteFromInputWithFlags
+            if ([keyboard respondsToSelector:@selector(deleteFromInputWithFlags:)])
+                [keyboard deleteFromInputWithFlags:event.keyboardFlags];
+            else
+                [keyboard deleteFromInput];
+            return YES;
+        }
+        break;
 
     case kWebSpaceKey:
-        if (!_page->editorState().isContentEditable) {
+        if (!contentEditable) {
             [_webView _scrollByOffset:FloatPoint(0, shift ? -_page->unobscuredContentRect().height() : _page->unobscuredContentRect().height())];
             return YES;
@@ -2722 +2724 @@
     case kWebEnterKey:
     case kWebReturnKey:
-        if (isCharEvent) {
+        if (contentEditable && isCharEvent) {
             // Map \r from HW keyboard to \n to match the behavior of the soft keyboard.
             [keyboard addInputString:@"\n" withFlags:0];
@@ -2734 +2736 @@
 
     default:
-        if (isCharEvent) {
+        if (contentEditable && isCharEvent) {
             [keyboard addInputString:event.characters withFlags:event.keyboardFlags];
             return YES;