From 8d473cf9743f1d30a16a27114e93bd5af5648d23 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 18 May 2012 14:03:11 +0200 Subject: Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578) Weekly snapshot --- Source/WebCore/page/DragController.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Source/WebCore/page/DragController.cpp') 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(keyState & PlatformEvent::ShiftKey); + ctrlKey = static_cast(keyState & PlatformEvent::CtrlKey); + altKey = static_cast(keyState & PlatformEvent::AltKey); + metaKey = static_cast(keyState & PlatformEvent::MetaKey); + return PlatformMouseEvent(dragData->clientPosition(), dragData->globalPosition(), LeftButton, PlatformEvent::MouseMoved, 0, shiftKey, ctrlKey, altKey, metaKey, currentTime()); -- cgit v1.2.1