diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 16:58:53 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 16:58:53 +0000 |
| commit | 6b1efe3b7fba6c62b020161bdc9eb9dd70fb3bb0 (patch) | |
| tree | e71329badc4bf99ba3840435303ac6033dc91fbd /content/browser/renderer_host/web_input_event_aurax11.cc | |
| parent | 92da5d2733639e2bddaaf04233cc879799e31a38 (diff) | |
| download | chromium_src-6b1efe3b7fba6c62b020161bdc9eb9dd70fb3bb0.zip chromium_src-6b1efe3b7fba6c62b020161bdc9eb9dd70fb3bb0.tar.gz chromium_src-6b1efe3b7fba6c62b020161bdc9eb9dd70fb3bb0.tar.bz2 | |
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
Diffstat (limited to 'content/browser/renderer_host/web_input_event_aurax11.cc')
| -rw-r--r-- | content/browser/renderer_host/web_input_event_aurax11.cc | 8 |
1 files changed, 3 insertions, 5 deletions
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] = |