From 6b1efe3b7fba6c62b020161bdc9eb9dd70fb3bb0 Mon Sep 17 00:00:00 2001 From: "sadrul@chromium.org" Date: Tue, 25 Oct 2011 16:58:53 +0000 Subject: aura: Fix shift/ctrl/alt keyevents with RWHVA and X11. One of the functions didn't really do what it claimed it did. This ended up causing problems where pressing just the shift key (or the ctrl or alt key) would cause some garbage character to show up. BUG=101440 TEST=manually Review URL: http://codereview.chromium.org/8380033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107141 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/renderer_host/web_input_event_aurax11.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'content/browser/renderer_host/web_input_event_aurax11.cc') diff --git a/content/browser/renderer_host/web_input_event_aurax11.cc b/content/browser/renderer_host/web_input_event_aurax11.cc index 2360cc9..64a9444 100644 --- a/content/browser/renderer_host/web_input_event_aurax11.cc +++ b/content/browser/renderer_host/web_input_event_aurax11.cc @@ -296,12 +296,10 @@ WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( webkit_event.windowsKeyCode = XKeyEventToWindowsKeyCode(native_key_event); webkit_event.nativeKeyCode = native_key_event->keycode; - if (webkit_event.windowsKeyCode == ui::VKEY_RETURN) { + if (webkit_event.windowsKeyCode == ui::VKEY_RETURN) webkit_event.unmodifiedText[0] = '\r'; - } else { - webkit_event.unmodifiedText[0] = - ui::DefaultXKeysymFromHardwareKeycode(native_key_event->keycode); - } + else + webkit_event.unmodifiedText[0] = ui::DefaultSymbolFromXEvent(native_event); if (webkit_event.modifiers & WebKit::WebInputEvent::ControlKey) { webkit_event.text[0] = -- cgit v1.1