Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / renderer / pepper / usb_key_code_conversion_win.cc

diff --git a/src/content/renderer/pepper/usb_key_code_conversion_win.cc b/src/content/renderer/pepper/usb_key_code_conversion_win.cc
index b04cd73..3dfa807 100644 (file)
--- a/src/content/renderer/pepper/usb_key_code_conversion_win.cc
+++ b/src/content/renderer/pepper/usb_key_code_conversion_win.cc
@@ -6,9 +6,9 @@
 
 #include "base/basictypes.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/base/keycodes/keycode_converter.h"
+#include "ui/events/keycodes/dom4/keycode_converter.h"
 
-using WebKit::WebKeyboardEvent;
+using blink::WebKeyboardEvent;
 
 namespace content {
 
@@ -18,13 +18,16 @@ uint32_t UsbKeyCodeForKeyboardEvent(const WebKeyboardEvent& key_event) {
   if ((key_event.nativeKeyCode & (1 << 24)) != 0)
     scancode |= 0xe000;
 
-  ui::KeycodeConverter* key_converter = ui::KeycodeConverter::GetInstance();
-  return key_converter->NativeKeycodeToUsbKeycode(scancode);
+  return ui::KeycodeConverter::NativeKeycodeToUsbKeycode(scancode);
 }
 
 const char* CodeForKeyboardEvent(const WebKeyboardEvent& key_event) {
-  ui::KeycodeConverter* key_converter = ui::KeycodeConverter::GetInstance();
-  return key_converter->NativeKeycodeToCode(key_event.nativeKeyCode);
+  // Extract the scancode and extended bit from the native key event's lParam.
+  int scancode = (key_event.nativeKeyCode >> 16) & 0x000000FF;
+  if ((key_event.nativeKeyCode & (1 << 24)) != 0)
+    scancode |= 0xe000;
+
+  return ui::KeycodeConverter::NativeKeycodeToCode(scancode);
 }
 
 }  // namespace content