Upstream version 7.35.144.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / WebInputEventFactoryAndroid.cpp

diff --git a/src/third_party/WebKit/Source/web/WebInputEventFactoryAndroid.cpp b/src/third_party/WebKit/Source/web/WebInputEventFactoryAndroid.cpp
index 5b204cd..f1274d5 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebInputEventFactoryAndroid.cpp
+++ b/src/third_party/WebKit/Source/web/WebInputEventFactoryAndroid.cpp
@@ -32,11 +32,11 @@
 #include "WebInputEventFactory.h"
 
 #include "WebInputEvent.h"
-#include "core/platform/chromium/KeyCodeConversion.h"
-#include "core/platform/chromium/KeyboardCodes.h"
+#include "platform/KeyCodeConversion.h"
+#include "platform/KeyboardCodes.h"
 #include "wtf/Assertions.h"
 
-namespace WebKit {
+namespace blink {
 
 WebKeyboardEvent WebInputEventFactory::keyboardEvent(WebInputEvent::Type type,
                                                      int modifiers,
@@ -104,6 +104,13 @@ WebMouseEvent WebInputEventFactory::mouseEvent(MouseEventType type,
     return result;
 }
 
+bool WebInputEventFactory::isSystemKeyEvent(const WebKeyboardEvent& event)
+{
+    // On Windows all keys with Alt modifier will be marked as system key.
+    // We keep the same behavior on Linux and everywhere non-Mac.
+    return event.modifiers & WebInputEvent::AltKey;
+}
+
 // WebMouseWheelEvent ------------------------------------------------------------
 
 WebMouseWheelEvent WebInputEventFactory::mouseWheelEvent(MouseWheelDirectionType direction,
@@ -176,4 +183,4 @@ WebGestureEvent WebInputEventFactory::gestureEvent(WebInputEvent::Type type,
     return result;
 }
 
-} // namespace WebKit
+} // namespace blink