| Index: webkit/glue/event_conversion.cc
|
| diff --git a/webkit/glue/event_conversion.cc b/webkit/glue/event_conversion.cc
|
| index 857fb9e9562948d2abdde9e8e060d5947e934e55..3d9a9115237d58a040d559dd1b3f6756d1761000 100644
|
| --- a/webkit/glue/event_conversion.cc
|
| +++ b/webkit/glue/event_conversion.cc
|
| @@ -8,6 +8,9 @@
|
|
|
| #if defined(OS_WIN)
|
| #include <windows.h>
|
| +#else
|
| +// This file defines all the windows VK_ key codes in the WebCore namespace.
|
| +#include "KeyboardCodes.h"
|
| #endif
|
|
|
| #include "StringImpl.h" // This is so that the KJS build works
|
| @@ -35,12 +38,10 @@ uint32 MakePlatformMouseEvent::last_click_time_ = 0;
|
|
|
| MakePlatformMouseEvent::MakePlatformMouseEvent(Widget* widget,
|
| const WebMouseEvent& e)
|
| -#if defined(OS_WIN)
|
| +#if defined(OS_WIN) || defined(OS_LINUX)
|
| {
|
| #elif defined(OS_MACOSX)
|
| : PlatformMouseEvent(e.mac_event.get()) {
|
| -#elif defined(OS_LINUX)
|
| - : PlatformMouseEvent() {
|
| #endif
|
| #if defined(OS_WIN) || defined(OS_LINUX)
|
| // TODO(mpcomplete): widget is always toplevel, unless it's a popup. We
|
| @@ -163,7 +164,6 @@ static inline String ToSingleCharacterString(UChar c) {
|
| return String(&c, 1);
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| static String GetKeyIdentifierForWindowsKeyCode(unsigned short keyCode) {
|
| switch (keyCode) {
|
| case VK_MENU:
|
| @@ -266,11 +266,6 @@ static String GetKeyIdentifierForWindowsKeyCode(unsigned short keyCode) {
|
| return String::format("U+%04X", toupper(keyCode));
|
| }
|
| }
|
| -#else
|
| -static String GetKeyIdentifierForWindowsKeyCode(unsigned short keyCode) {
|
| - return String::format("U+%04X", toupper(keyCode));
|
| -}
|
| -#endif
|
|
|
| MakePlatformKeyboardEvent::MakePlatformKeyboardEvent(const WebKeyboardEvent& e)
|
| #if defined(OS_WIN) || defined(OS_LINUX)
|
| @@ -335,4 +330,3 @@ bool MakePlatformKeyboardEvent::IsCharacterKey() const {
|
| }
|
| return true;
|
| }
|
| -
|
|
|