diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-29 00:03:30 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-29 00:03:30 +0000 |
| commit | d158a34ccbe74581a7f08d4a508767b1382ba7de (patch) | |
| tree | 151f19fcf494beea8922ffec64449b6235e322ed /content/browser | |
| parent | 835508384be23d1d5a3cc09f3814bd344f5bcd51 (diff) | |
| download | chromium_src-d158a34ccbe74581a7f08d4a508767b1382ba7de.zip chromium_src-d158a34ccbe74581a7f08d4a508767b1382ba7de.tar.gz chromium_src-d158a34ccbe74581a7f08d4a508767b1382ba7de.tar.bz2 | |
Fix RenderViewImplTest on Ozone build
1) RenderViewImplTest::SendKeyEvent fabricates native events for each platform, creates a NativeWebKeyboardEvent and sends it. Running the tests with Ozone would fall through to the NOTIMPLEMENTED case. Added an Ozone implementation to process these events.
2) MakeWebKeyboardEventFromAuraEvent for Ozone did not process the character passed in. This would result in passing the raw character rather than processing any control keys (such as shift).
BUG=315392
Review URL: https://codereview.chromium.org/92693002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/renderer_host/web_input_event_aura.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/content/browser/renderer_host/web_input_event_aura.cc b/content/browser/renderer_host/web_input_event_aura.cc index 5127c07..f35d377 100644 --- a/content/browser/renderer_host/web_input_event_aura.cc +++ b/content/browser/renderer_host/web_input_event_aura.cc @@ -9,6 +9,10 @@ #include "ui/events/event.h" #include "ui/events/event_utils.h" +#if defined(USE_OZONE) +#include "ui/events/keycodes/keyboard_code_conversion.h" +#endif + namespace content { #if defined(USE_X11) || defined(USE_OZONE) @@ -101,7 +105,9 @@ blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( if (webkit_event.windowsKeyCode == ui::VKEY_RETURN) webkit_event.unmodifiedText[0] = '\r'; else - webkit_event.unmodifiedText[0] = character; + webkit_event.unmodifiedText[0] = ui::GetCharacterFromKeyCode( + ui::KeyboardCodeFromNative(native_event), + ui::EventFlagsFromNative(native_event)); if (webkit_event.modifiers & blink::WebInputEvent::ControlKey) { webkit_event.text[0] = |