| Index: Source/platform/PlatformKeyboardEvent.cpp
|
| diff --git a/Source/core/platform/chromium/PlatformKeyboardEventChromium.cpp b/Source/platform/PlatformKeyboardEvent.cpp
|
| similarity index 92%
|
| rename from Source/core/platform/chromium/PlatformKeyboardEventChromium.cpp
|
| rename to Source/platform/PlatformKeyboardEvent.cpp
|
| index 2c69ff871200ceba5a0c83e406924d5fe34e06f8..1faa729c3f3e79d0b8be84aee877320adae84dce 100644
|
| --- a/Source/core/platform/chromium/PlatformKeyboardEventChromium.cpp
|
| +++ b/Source/platform/PlatformKeyboardEvent.cpp
|
| @@ -25,7 +25,7 @@
|
| */
|
|
|
| #include "config.h"
|
| -#include "core/platform/PlatformKeyboardEvent.h"
|
| +#include "platform/PlatformKeyboardEvent.h"
|
|
|
| #if OS(WIN)
|
| #include <windows.h>
|
| @@ -38,7 +38,7 @@
|
| namespace WebCore {
|
|
|
| #if OS(WIN)
|
| -static const unsigned short HIGH_BIT_MASK_SHORT = 0x8000;
|
| +static const unsigned short HIGHBITMASKSHORT = 0x8000;
|
| #endif
|
|
|
| void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type type)
|
| @@ -87,9 +87,9 @@ bool PlatformKeyboardEvent::currentCapsLockState()
|
| void PlatformKeyboardEvent::getCurrentModifierState(bool& shiftKey, bool& ctrlKey, bool& altKey, bool& metaKey)
|
| {
|
| #if OS(WIN)
|
| - shiftKey = GetKeyState(VK_SHIFT) & HIGH_BIT_MASK_SHORT;
|
| - ctrlKey = GetKeyState(VK_CONTROL) & HIGH_BIT_MASK_SHORT;
|
| - altKey = GetKeyState(VK_MENU) & HIGH_BIT_MASK_SHORT;
|
| + shiftKey = GetKeyState(VK_SHIFT) & HIGHBITMASKSHORT;
|
| + ctrlKey = GetKeyState(VK_CONTROL) & HIGHBITMASKSHORT;
|
| + altKey = GetKeyState(VK_MENU) & HIGHBITMASKSHORT;
|
| metaKey = false;
|
| #elif OS(MACOSX)
|
| UInt32 currentModifiers = GetCurrentKeyModifiers();
|
|
|