diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
commit | 8d473cf9743f1d30a16a27114e93bd5af5648d23 (patch) | |
tree | cdca40d0353886b3ca52f33a2d7b8f1c0011aafc /Source/WebCore/page/DragController.cpp | |
parent | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (diff) | |
download | qtwebkit-8d473cf9743f1d30a16a27114e93bd5af5648d23.tar.gz |
Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578)
Weekly snapshot
Diffstat (limited to 'Source/WebCore/page/DragController.cpp')
-rw-r--r-- | Source/WebCore/page/DragController.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/WebCore/page/DragController.cpp b/Source/WebCore/page/DragController.cpp index 89d72ae83..135446cf4 100644 --- a/Source/WebCore/page/DragController.cpp +++ b/Source/WebCore/page/DragController.cpp @@ -77,7 +77,12 @@ static PlatformMouseEvent createMouseEvent(DragData* dragData) { bool shiftKey, ctrlKey, altKey, metaKey; shiftKey = ctrlKey = altKey = metaKey = false; - PlatformKeyboardEvent::getCurrentModifierState(shiftKey, ctrlKey, altKey, metaKey); + int keyState = dragData->modifierKeyState(); + shiftKey = static_cast<bool>(keyState & PlatformEvent::ShiftKey); + ctrlKey = static_cast<bool>(keyState & PlatformEvent::CtrlKey); + altKey = static_cast<bool>(keyState & PlatformEvent::AltKey); + metaKey = static_cast<bool>(keyState & PlatformEvent::MetaKey); + return PlatformMouseEvent(dragData->clientPosition(), dragData->globalPosition(), LeftButton, PlatformEvent::MouseMoved, 0, shiftKey, ctrlKey, altKey, metaKey, currentTime()); |