[KeyboardEvent] Add embedder APIs to translate between Dom |key| enum and strings

content/browser/renderer_host/web_input_event_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/web_input_event_aura.h"
 
 #include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "content/browser/renderer_host/ui_events_helper.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
 #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 {
 
 namespace {
 
 gfx::Point GetScreenLocationFromEvent(const ui::LocatedEvent& event) {
   if (!event.target())
     return event.root_location();
 
@@ skipping 54 matching lines @@
       NOTREACHED();
   }
 
   if (webkit_event.modifiers & blink::WebInputEvent::AltKey)
     webkit_event.isSystemKey = true;
 
   webkit_event.windowsKeyCode = event.GetLocatedWindowsKeyboardCode();
   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);
+
   webkit_event.unmodifiedText[0] = event.GetUnmodifiedText();
   webkit_event.text[0] = event.GetText();
 
   webkit_event.setKeyIdentifierFromWindowsKeyCode();
 
   return webkit_event;
 }
 
 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
     const ui::ScrollEvent& event) {
@@ skipping 171 matching lines @@
   // event.native_event(). X11 is not so fortunate, there is no separate
   // translated event type, so DesktopHostLinux sends an extra KeyEvent with
   // is_char() == true. We need to pass the ui::KeyEvent to the X11 function
   // to detect this case so the right event type can be constructed.
 #if defined(OS_WIN)
   if (event.HasNativeEvent()) {
     // Key events require no translation by the aura system.
     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());

[Wez, 2015/06/25 10:40:21]

As discussed elsewhere, this won't work since GetCharacter fetches |character_|,
which is set only for keypress events, not for keydown or keyup events - we'll
need to change that if we want to use DomKey+Character to generate the DOM |key|
that we pass to WebKit.

[Habib Virji, 2015/06/26 17:35:38]

As I understand based on your previous comments this is specific to windows,
(not getting character_ for keyDown and keyUp events). Since I am working on
Linux this issue is not that apparent.

Can we have a follow up CL for Windows to support keyDown and keyUp events.

+    else
+      webkit_event.domKey = DOM_KEY_PRINT_NON_DIFF + static_cast<int>(dom_key);
+
+    if (webkit_event.domKey == DomKey::None)
+      webkit_event.domKey = static_cast<int>(event.GetCharacter());
     return webkit_event;
   }
 #endif
   return MakeWebKeyboardEventFromAuraEvent(event);
 }
 
 blink::WebGestureEvent MakeWebGestureEvent(const ui::GestureEvent& event) {
   blink::WebGestureEvent gesture_event;
 #if defined(OS_WIN)
   if (event.HasNativeEvent())
@@ skipping 106 matching lines @@
     webkit_event.deltaY = event.y_offset();
   }
 
   webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick;
   webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick;
 
   return webkit_event;
 }
 
 }  // namespace content