From 284837daa07b29d6a63a748544a90b1f5842ac5c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 10 Sep 2012 19:10:20 +0200
Subject: Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d
 (http://svn.webkit.org/repository/webkit/trunk@128073)

New snapshot
---
 Source/WebKit/chromium/src/android/WebInputEventFactory.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Source/WebKit/chromium/src/android/WebInputEventFactory.cpp')

diff --git a/Source/WebKit/chromium/src/android/WebInputEventFactory.cpp b/Source/WebKit/chromium/src/android/WebInputEventFactory.cpp
index fb723223b..9bc70faca 100644
--- a/Source/WebKit/chromium/src/android/WebInputEventFactory.cpp
+++ b/Source/WebKit/chromium/src/android/WebInputEventFactory.cpp
@@ -50,7 +50,9 @@ WebKeyboardEvent WebInputEventFactory::keyboardEvent(WebInputEvent::Type type,
     result.type = type;
     result.modifiers = modifiers;
     result.timeStampSeconds = timeStampSeconds;
-    result.windowsKeyCode = WebCore::windowsKeyCodeForKeyEvent(keycode);
+    int windowsKeyCode = WebCore::windowsKeyCodeForKeyEvent(keycode);
+    result.windowsKeyCode = WebKeyboardEvent::windowsKeyCodeWithoutLocation(windowsKeyCode);
+    result.modifiers |= WebKeyboardEvent::locationModifiersFromWindowsKeyCode(windowsKeyCode);
     result.nativeKeyCode = keycode;
     result.unmodifiedText[0] = unicodeCharacter;
     if (result.windowsKeyCode == WebCore::VKEY_RETURN) {
-- 
cgit v1.2.1