From a8a1992ce36c243c05cd649558e6da6f6d61f3b6 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Wed, 19 Oct 2011 20:27:07 +0000 Subject: Get KeyEvents to limp in Aura. This assumes the desktop host is going to send two aura::KeyEvents for every keydown - one raw key down, and one char. They share the same ET, but the first has is_char = false, the second is_char = true. http://crbug.com/99757 TEST=none Review URL: http://codereview.chromium.org/8342026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106374 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/renderer_host/web_input_event_aurax11.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 c361b2b..2b54343 100644 --- a/content/browser/renderer_host/web_input_event_aurax11.cc +++ b/content/browser/renderer_host/web_input_event_aurax11.cc @@ -251,8 +251,9 @@ WebKit::WebMouseEvent MakeWebMouseEventFromAuraEvent(aura::MouseEvent* event) { return webkit_event; } -WebKit::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent( - base::NativeEvent native_event) { +WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( + aura::KeyEvent* event) { + base::NativeEvent native_event = event->native_event(); WebKit::WebKeyboardEvent webkit_event; XKeyEvent* native_key_event = &native_event->xkey; @@ -262,7 +263,8 @@ WebKit::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent( switch (native_event->type) { case KeyPress: - webkit_event.type = WebKit::WebInputEvent::RawKeyDown; + webkit_event.type = event->is_char() ? WebKit::WebInputEvent::Char : + WebKit::WebInputEvent::RawKeyDown; break; case KeyRelease: webkit_event.type = WebKit::WebInputEvent::KeyUp; -- cgit v1.1