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

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

Issue 929053004: [KeyboardEvent] Add embedder APIs to translate between Dom |key| enum and strings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: UnitTest updated as MakeKeyboardEvent now adds a value to differentiate Created 5 years, 6 months 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
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 b09f67e680220fd00d9726e98172ef2b9a523e94..2341810c91eac7e8443bce2b78337effbcdc6fa0 100644
--- a/content/browser/renderer_host/web_input_event_aura.cc
+++ b/content/browser/renderer_host/web_input_event_aura.cc
@@ -11,6 +11,7 @@
#include "ui/events/blink/blink_event_util.h"
#include "ui/events/event.h"
#include "ui/events/event_utils.h"
+#include "ui/events/keycodes/dom/dom_key.h"
#include "ui/events/keycodes/dom/keycode_converter.h"
namespace content {
@@ -85,6 +86,13 @@ blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent(
webkit_event.nativeKeyCode =
ui::KeycodeConverter::DomCodeToNativeKeycode(event.code());
webkit_event.domCode = static_cast<int>(event.code());
+
+ ui::DomKey dom_key = event.GetDomKey();
+ if (dom_key == ui::DomKey::CHARACTER)
+ webkit_event.domKey = static_cast<int>(event.GetCharacter());
+ else
+ webkit_event.domKey = DOM_KEY_PRINT_NON_DIFF + static_cast<int>(dom_key);
Wez 2015/07/25 23:12:26 Can you have this code re-use the same logic as th
Habib Virji 2015/07/31 16:17:29 Done. Have introduced GetDomKeyOrCharacter() to ge
+
webkit_event.unmodifiedText[0] = event.GetUnmodifiedText();
webkit_event.text[0] = event.GetText();
@@ -276,6 +284,13 @@ blink::WebKeyboardEvent MakeWebKeyboardEvent(const ui::KeyEvent& event) {
blink::WebKeyboardEvent webkit_event(
MakeWebKeyboardEventFromNativeEvent(event.native_event()));
webkit_event.domCode = static_cast<int>(event.code());
+
+ ui::DomKey dom_key = event.GetDomKey();
+ if (dom_key == ui::DomKey::CHARACTER)
+ webkit_event.domKey = static_cast<int>(event.GetCharacter());
+ else
+ webkit_event.domKey = DOM_KEY_PRINT_NON_DIFF + static_cast<int>(dom_key);
Wez 2015/07/25 23:12:26 See above re adding a reusable helper for this.
Habib Virji 2015/07/31 16:17:29 Done.
+
return webkit_event;
}
#endif

Powered by Google App Engine
This is Rietveld 408576698