Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Unified Diff: content/browser/renderer_host/web_input_event_aura.cc

Issue 1550953002: Keyboard events with keypad had wrong keycodes on ozone. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/events/keycodes/keyboard_code_conversion.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/web_input_event_aura.cc
diff --git a/content/browser/renderer_host/web_input_event_aura.cc b/content/browser/renderer_host/web_input_event_aura.cc
index 7d67025a04bd50705e9e79c01523eb75b6b20a07..170775b0ff2fbda766844c4497db8efb36c852f0 100644
--- a/content/browser/renderer_host/web_input_event_aura.cc
+++ b/content/browser/renderer_host/web_input_event_aura.cc
@@ -12,6 +12,7 @@
#include "ui/events/event.h"
#include "ui/events/event_utils.h"
#include "ui/events/keycodes/dom/keycode_converter.h"
+#include "ui/events/keycodes/keyboard_code_conversion.h"
namespace content {
@@ -85,7 +86,11 @@ blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent(
if (webkit_event.modifiers & blink::WebInputEvent::AltKey)
webkit_event.isSystemKey = true;
- webkit_event.windowsKeyCode = event.key_code();
+ // TODO(dtapuska): crbug.com/570388. Ozone appears to deliver
+ // key_code events that aren't "located" for the keypad like
+ // Windows and X11 do and blink expects.
+ webkit_event.windowsKeyCode =
+ ui::NonLocatedToLocatedKeypadKeyboardCode(event.key_code(), event.code());
webkit_event.nativeKeyCode =
ui::KeycodeConverter::DomCodeToNativeKeycode(event.code());
webkit_event.domCode = static_cast<int>(event.code());
« no previous file with comments | « no previous file | ui/events/keycodes/keyboard_code_conversion.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698