Cleanup IsKeyPad and IsAutoRepeat in PlatformKeyboardEvent

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 84 matching lines @@
         newModifiers |= PlatformEvent::ShiftKey;
     if (webModifiers & WebInputEvent::ControlKey)
         newModifiers |= PlatformEvent::CtrlKey;
     if (webModifiers & WebInputEvent::AltKey)
         newModifiers |= PlatformEvent::AltKey;
     if (webModifiers & WebInputEvent::MetaKey)
         newModifiers |= PlatformEvent::MetaKey;
     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;
+    return newModifiers;
+}
+
 unsigned toPlatformMouseEventModifiers(int webModifiers)
 {
     unsigned newModifiers = toPlatformEventModifiers(webModifiers);
     if (webModifiers & WebInputEvent::LeftButtonDown)
         newModifiers |= PlatformEvent::LeftButtonDown;
     if (webModifiers & WebInputEvent::MiddleButtonDown)
         newModifiers |= PlatformEvent::MiddleButtonDown;
     if (webModifiers & WebInputEvent::RightButtonDown)
         newModifiers |= PlatformEvent::RightButtonDown;
     return newModifiers;
@@ skipping 181 matching lines @@
     }
     return PlatformEvent::KeyDown;
 }
 
 PlatformKeyboardEventBuilder::PlatformKeyboardEventBuilder(const WebKeyboardEvent& e)
 {
     m_type = toPlatformKeyboardEventType(e.type);
     m_text = String(e.text);
     m_unmodifiedText = String(e.unmodifiedText);
     m_keyIdentifier = String(e.keyIdentifier);
-    m_autoRepeat = (e.modifiers & WebInputEvent::IsAutoRepeat);
     m_nativeVirtualKeyCode = e.nativeKeyCode;
-    m_isKeypad = (e.modifiers & WebInputEvent::IsKeyPad);
     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 = toPlatformEventModifiers(e.modifiers);
+    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;
@@ skipping 427 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