Remove PlatformKeyboardEvents requirement to have located virtual keycode information.

Source/web/WebInputEventConversion.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 91 matching lines @@
     return newModifiers;
 }
 
 static unsigned toPlatformKeyboardEventModifiers(int webModifiers)
 {
     unsigned newModifiers = toPlatformEventModifiers(webModifiers);
     if (webModifiers & WebInputEvent::IsKeyPad)
         newModifiers |= PlatformEvent::IsKeyPad;
     if (webModifiers & WebInputEvent::IsAutoRepeat)
         newModifiers |= PlatformEvent::IsAutoRepeat;
+    if (webModifiers & WebInputEvent::IsLeft)
+        newModifiers |= PlatformEvent::IsLeft;
+    if (webModifiers & WebInputEvent::IsRight)
+        newModifiers |= PlatformEvent::IsRight;
     return newModifiers;
 }
 
 unsigned toPlatformMouseEventModifiers(int webModifiers)
 {
     unsigned newModifiers = toPlatformEventModifiers(webModifiers);
     if (webModifiers & WebInputEvent::LeftButtonDown)
         newModifiers |= PlatformEvent::LeftButtonDown;
     if (webModifiers & WebInputEvent::MiddleButtonDown)
         newModifiers |= PlatformEvent::MiddleButtonDown;
@@ skipping 197 matching lines @@
     m_text = String(e.text);
     m_unmodifiedText = String(e.unmodifiedText);
     m_keyIdentifier = String(e.keyIdentifier);
     m_nativeVirtualKeyCode = e.nativeKeyCode;
     m_isSystemKey = e.isSystemKey;
     // TODO: BUG482880 Fix this initialization to lazy initialization.
     m_code = Platform::current()->domCodeStringFromEnum(e.domCode);
     m_key = Platform::current()->domKeyStringFromEnum(e.domKey);
 
     m_modifiers = toPlatformKeyboardEventModifiers(e.modifiers);
-
-    // FIXME: PlatformKeyboardEvents expect a locational version of the keycode (e.g. VK_LSHIFT
-    // instead of VK_SHIFT). This should be changed so the location/keycode are stored separately,
-    // as in other places in the code.
     m_windowsVirtualKeyCode = e.windowsKeyCode;
-    if (e.windowsKeyCode == VK_SHIFT) {
-        if (e.modifiers & WebInputEvent::IsLeft)
-            m_windowsVirtualKeyCode = VK_LSHIFT;
-        else if (e.modifiers & WebInputEvent::IsRight)
-            m_windowsVirtualKeyCode = VK_RSHIFT;
-    } else if (e.windowsKeyCode == VK_CONTROL) {
-        if (e.modifiers & WebInputEvent::IsLeft)
-            m_windowsVirtualKeyCode = VK_LCONTROL;
-        else if (e.modifiers & WebInputEvent::IsRight)
-            m_windowsVirtualKeyCode = VK_RCONTROL;
-    } else if (e.windowsKeyCode == VK_MENU) {
-        if (e.modifiers & WebInputEvent::IsLeft)
-            m_windowsVirtualKeyCode = VK_LMENU;
-        else if (e.modifiers & WebInputEvent::IsRight)
-            m_windowsVirtualKeyCode = VK_RMENU;
-    }
-
 }
 
 void PlatformKeyboardEventBuilder::setKeyType(Type type)
 {
     // According to the behavior of Webkit in Windows platform,
     // we need to convert KeyDown to RawKeydown and Char events
     // See WebKit/WebKit/Win/WebView.cpp
     ASSERT(m_type == KeyDown);
     ASSERT(type == RawKeyDown || type == Char);
     m_type = type;
@@ skipping 414 matching lines @@
     modifiers = getWebInputModifiers(event);
 
     globalX = event.screenX();
     globalY = event.screenY();
     IntPoint localPoint = convertAbsoluteLocationForLayoutObject(event.absoluteLocation(), *layoutObject);
     x = localPoint.x();
     y = localPoint.y();
 }
 
 } // namespace blink