diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-16 14:51:15 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-16 14:51:15 +0200 |
commit | 4e6b3a206fa4ad8bb0b664f7674c9a70376d6e26 (patch) | |
tree | 7bb9ad7e31c24d1cf1707e03e6f1a80f6d033951 /Tools/DumpRenderTree/chromium | |
parent | 3977e3d2f72f7fe2c887c1ec0e0c342e1d169f42 (diff) | |
download | qtwebkit-4e6b3a206fa4ad8bb0b664f7674c9a70376d6e26.tar.gz |
Imported WebKit commit 953baa67aa07087b6ecd4199351ec554c724e27d (http://svn.webkit.org/repository/webkit/trunk@122676)
Diffstat (limited to 'Tools/DumpRenderTree/chromium')
-rw-r--r-- | Tools/DumpRenderTree/chromium/EventSender.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Tools/DumpRenderTree/chromium/EventSender.cpp b/Tools/DumpRenderTree/chromium/EventSender.cpp index 47bec2a71..7e81f3b54 100644 --- a/Tools/DumpRenderTree/chromium/EventSender.cpp +++ b/Tools/DumpRenderTree/chromium/EventSender.cpp @@ -351,7 +351,7 @@ void EventSender::doDragDrop(const WebDragData& dragData, WebDragOperationsMask WebPoint screenPoint(event.globalX, event.globalY); currentDragData = dragData; currentDragEffectsAllowed = mask; - currentDragEffect = webview()->dragTargetDragEnter(dragData, clientPoint, screenPoint, currentDragEffectsAllowed); + currentDragEffect = webview()->dragTargetDragEnter(dragData, clientPoint, screenPoint, currentDragEffectsAllowed, 0); // Finish processing events. replaySavedEvents(); @@ -466,9 +466,9 @@ void EventSender::doMouseUp(const WebMouseEvent& e) WebPoint clientPoint(e.x, e.y); WebPoint screenPoint(e.globalX, e.globalY); - currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed); + currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed, 0); if (currentDragEffect) - webview()->dragTargetDrop(clientPoint, screenPoint); + webview()->dragTargetDrop(clientPoint, screenPoint, 0); else webview()->dragTargetDragLeave(); webview()->dragSourceEndedAt(clientPoint, screenPoint, currentDragEffect); @@ -509,7 +509,7 @@ void EventSender::doMouseMove(const WebMouseEvent& e) return; WebPoint clientPoint(e.x, e.y); WebPoint screenPoint(e.globalX, e.globalY); - currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed); + currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed, 0); } void EventSender::keyDown(const CppArgumentList& arguments, CppVariant* result) @@ -912,7 +912,7 @@ void EventSender::beginDragWithFiles(const CppArgumentList& arguments, CppVarian currentDragEffectsAllowed = WebKit::WebDragOperationCopy; // Provide a drag source. - webview()->dragTargetDragEnter(currentDragData, lastMousePos, lastMousePos, currentDragEffectsAllowed); + webview()->dragTargetDragEnter(currentDragData, lastMousePos, lastMousePos, currentDragEffectsAllowed, 0); // dragMode saves events and then replays them later. We don't need/want that. dragMode.set(false); @@ -1043,10 +1043,14 @@ void EventSender::handleMouseWheel(const CppArgumentList& arguments, CppVariant* int horizontal = arguments[0].toInt32(); int vertical = arguments[1].toInt32(); int paged = false; + int hasPreciseScrollingDeltas = false; if (arguments.size() > 2 && arguments[2].isBool()) paged = arguments[2].toBoolean(); + if (arguments.size() > 3 && arguments[3].isBool()) + hasPreciseScrollingDeltas = arguments[3].toBoolean(); + WebMouseWheelEvent event; initMouseEvent(WebInputEvent::MouseWheel, pressedButton, lastMousePos, &event); event.wheelTicksX = static_cast<float>(horizontal); @@ -1054,6 +1058,8 @@ void EventSender::handleMouseWheel(const CppArgumentList& arguments, CppVariant* event.deltaX = event.wheelTicksX; event.deltaY = event.wheelTicksY; event.scrollByPage = paged; + event.hasPreciseScrollingDeltas = hasPreciseScrollingDeltas; + if (continuous) { event.wheelTicksX /= scrollbarPixelsPerTick; event.wheelTicksY /= scrollbarPixelsPerTick; |