Changeset 165477 in webkit

Timestamp:

Mar 12, 2014 10:19:33 AM (10 years ago)

Author:

ap@apple.com

Message:

REGRESSION (r165356): [Mac] Multi-part key bindings don't work
​https://bugs.webkit.org/show_bug.cgi?id=130100

Reviewed by Darin Adler.

Restore the previous behavior, where we only interpreted keydowns (including those
coming through performKeyEquivalent).

In the future, we might send all events to input methods, but not to key bindings.

• UIProcess/API/mac/WKView.mm:

(-[WKView keyUp:]):
(-[WKView flagsChanged:]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-11  Alexey Proskuryakov  <ap@apple.com>
+
+        REGRESSION (r165356): [Mac] Multi-part key bindings don't work
+        https://bugs.webkit.org/show_bug.cgi?id=130100
+
+        Reviewed by Darin Adler.
+
+        Restore the previous behavior, where we only interpreted keydowns (including those
+        coming through performKeyEquivalent).
+
+        In the future, we might send all events to input methods, but not to key bindings.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView keyUp:]):
+        (-[WKView flagsChanged:]):
+
 2014-03-11  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -1335 +1335 @@
 {
     LOG(TextInput, "keyUp:%p %@", theEvent, theEvent);
-
-    Vector<KeypressCommand> commands;
-    BOOL handledByInputMethod = [self _interpretKeyEvent:theEvent savingCommandsTo:commands];
-
-    _data->_page->handleKeyboardEvent(NativeWebKeyboardEvent(theEvent, handledByInputMethod, commands));
+    // We don't interpret the keyUp event, as this breaks key bindings (see <https://bugs.webkit.org/show_bug.cgi?id=130100>).
+    _data->_page->handleKeyboardEvent(NativeWebKeyboardEvent(theEvent, false, Vector<KeypressCommand>()));
 }
 
@@ -1441 +1438 @@
         return;
 
-    Vector<KeypressCommand> commands;
-    BOOL handledByInputMethod = [self _interpretKeyEvent:theEvent savingCommandsTo:commands];
-
-    _data->_page->handleKeyboardEvent(NativeWebKeyboardEvent(theEvent, handledByInputMethod, commands));
+    _data->_page->handleKeyboardEvent(NativeWebKeyboardEvent(theEvent, false, Vector<KeypressCommand>()));
 }