Improve MakeWebKeyboardEventFromAuraEvent()

content/browser/renderer_host/web_input_event_aurax11.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.
 
 // Portions based heavily on:
 // third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.cpp
 //
 /*
  * Copyright (C) 2006-2011 Google Inc. All rights reserved.
  *
@@ skipping 39 matching lines @@
 namespace content {
 
 // chromium WebKit does not provide a WebInputEventFactory for X11, so we have
 // to do the work here ourselves.
 
 namespace {
 
 // This matches Firefox behavior.
 const int kPixelsPerTick = 53;
 
+// Normalizes event.flags() to make it Windows/Mac compatible. Since the way
+// of setting modifier mask on X is very different than Windows/Mac as shown
+// in http://crbug.com/127142#c8, the normalization is necessary.
+int NormalizeEventFlags(const aura::KeyEvent& event) {
+  int mask = 0;
+  switch (event.key_code()) {
+    case ui::VKEY_CONTROL:
+      mask = ui::EF_CONTROL_DOWN;
+      break;
+    case ui::VKEY_SHIFT:
+      mask = ui::EF_SHIFT_DOWN;
+      break;
+    case ui::VKEY_MENU:
+      mask = ui::EF_ALT_DOWN;
+      break;
+    case ui::VKEY_CAPITAL:
+      mask = ui::EF_CAPS_LOCK_DOWN;
+      break;
+    default:
+      return event.flags();
+  }
+  if (event.type() == ui::ET_KEY_PRESSED)
+    return event.flags() | mask;
+  return event.flags() & ~mask;
+}
+
 int EventFlagsToWebEventModifiers(int flags) {
   int modifiers = 0;
   if (flags & ui::EF_SHIFT_DOWN)
     modifiers |= WebKit::WebInputEvent::ShiftKey;
   if (flags & ui::EF_CONTROL_DOWN)
     modifiers |= WebKit::WebInputEvent::ControlKey;
   if (flags & ui::EF_ALT_DOWN)
     modifiers |= WebKit::WebInputEvent::AltKey;
   // TODO(beng): MetaKey/META_MASK
   if (flags & ui::EF_LEFT_MOUSE_BUTTON)
     modifiers |= WebKit::WebInputEvent::LeftButtonDown;
   if (flags & ui::EF_MIDDLE_MOUSE_BUTTON)
     modifiers |= WebKit::WebInputEvent::MiddleButtonDown;
   if (flags & ui::EF_RIGHT_MOUSE_BUTTON)
     modifiers |= WebKit::WebInputEvent::RightButtonDown;
   if (flags & ui::EF_CAPS_LOCK_DOWN)
     modifiers |= WebKit::WebInputEvent::CapsLockOn;
   return modifiers;
 }
 
-int XStateToWebEventModifiers(unsigned int state) {
-  int modifiers = 0;
-  if (state & ShiftMask)
-    modifiers |= WebKit::WebInputEvent::ShiftKey;
-  if (state & ControlMask)
-    modifiers |= WebKit::WebInputEvent::ControlKey;
-  if (state & Mod1Mask)
-    modifiers |= WebKit::WebInputEvent::AltKey;
-  // TODO(beng): MetaKey/META_MASK
-  if (state & Button1Mask)
-    modifiers |= WebKit::WebInputEvent::LeftButtonDown;
-  if (state & Button2Mask)
-    modifiers |= WebKit::WebInputEvent::MiddleButtonDown;
-  if (state & Button3Mask)
-    modifiers |= WebKit::WebInputEvent::RightButtonDown;
-  if (state & LockMask)
-    modifiers |= WebKit::WebInputEvent::CapsLockOn;
-  if (state & Mod2Mask)
-    modifiers |= WebKit::WebInputEvent::NumLockOn;
-  return modifiers;
-}
-
 int XKeyEventToWindowsKeyCode(XKeyEvent* event) {
   return ui::KeyboardCodeFromXKeyEvent((XEvent*)event);
 }
 
 // From
 // third_party/WebKit/Source/WebKit/chromium/src/gtk/WebInputEventFactory.cpp:
 WebKit::WebUChar GetControlCharacter(int windows_key_code, bool shift) {
   if (windows_key_code >= ui::VKEY_A &&
     windows_key_code <= ui::VKEY_Z) {
     // ctrl-A ~ ctrl-Z map to \x01 ~ \x1A
@@ skipping 164 matching lines @@
   return webkit_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;
 
   webkit_event.timeStampSeconds = event->time_stamp().InSecondsF();
-  webkit_event.modifiers = XStateToWebEventModifiers(native_key_event->state);
+  webkit_event.modifiers =
+      EventFlagsToWebEventModifiers(NormalizeEventFlags(*event));
 
   switch (native_event->type) {
     case KeyPress:
       webkit_event.type = event->is_char() ? WebKit::WebInputEvent::Char :
           WebKit::WebInputEvent::RawKeyDown;
       break;
     case KeyRelease:
       webkit_event.type = WebKit::WebInputEvent::KeyUp;
       break;
     default:
@@ skipping 151 matching lines @@
 
   // Update the type of the touch event.
   web_event->type = TouchEventTypeFromEvent(event);
   web_event->timeStampSeconds = event->time_stamp().InSecondsF();
   web_event->modifiers = EventFlagsToWebEventModifiers(event->flags());
 
   return point;
 }
 
 }  // namespace content