Title: [165477] trunk/Source/WebKit2
- Revision
- 165477
- Author
- [email protected]
- Date
- 2014-03-12 10:19:33 -0700 (Wed, 12 Mar 2014)
Log 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:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (165476 => 165477)
--- trunk/Source/WebKit2/ChangeLog 2014-03-12 17:02:06 UTC (rev 165476)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-12 17:19:33 UTC (rev 165477)
@@ -1,3 +1,19 @@
+2014-03-11 Alexey Proskuryakov <[email protected]>
+
+ 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 <[email protected]>
_pageExtendedBackgroundColor should not be exposed on WKWebView
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (165476 => 165477)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-03-12 17:02:06 UTC (rev 165476)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-03-12 17:19:33 UTC (rev 165477)
@@ -1334,11 +1334,8 @@
- (void)keyUp:(NSEvent *)theEvent
{
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>()));
}
- (void)_disableComplexTextInputIfNecessary
@@ -1440,10 +1437,7 @@
if (!keyCode || keyCode == 10 || keyCode == 63)
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>()));
}
- (void)_executeSavedKeypressCommands
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
