diff options
Diffstat (limited to 'Source/WebCore/page/mac')
-rw-r--r-- | Source/WebCore/page/mac/DragControllerMac.mm | 7 | ||||
-rw-r--r-- | Source/WebCore/page/mac/EventHandlerMac.mm | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Source/WebCore/page/mac/DragControllerMac.mm b/Source/WebCore/page/mac/DragControllerMac.mm index 9b61510..70a10a7 100644 --- a/Source/WebCore/page/mac/DragControllerMac.mm +++ b/Source/WebCore/page/mac/DragControllerMac.mm @@ -72,8 +72,11 @@ void DragController::cleanupAfterSystemDrag() // Drag has ended, dragEnded *should* have been called, however it is possible // for the UIDelegate to take over the drag, and fail to send the appropriate // drag termination event. As dragEnded just resets drag variables, we just - // call it anyway to be on the safe side - dragEnded(); + // call it anyway to be on the safe side. + // We don't want to do this for WebKit2, since the client call to start the drag + // is asynchronous. + if (m_page->mainFrame()->view()->platformWidget()) + dragEnded(); } } // namespace WebCore diff --git a/Source/WebCore/page/mac/EventHandlerMac.mm b/Source/WebCore/page/mac/EventHandlerMac.mm index 5e96917..d93cc82 100644 --- a/Source/WebCore/page/mac/EventHandlerMac.mm +++ b/Source/WebCore/page/mac/EventHandlerMac.mm @@ -113,8 +113,6 @@ bool EventHandler::wheelEvent(NSEvent *event) CurrentEventScope scope(event); - m_useLatchedWheelEventNode = wkIsLatchingWheelEvent(event); - PlatformWheelEvent wheelEvent(event, page->chrome()->platformPageClient()); handleWheelEvent(wheelEvent); @@ -170,7 +168,7 @@ void EventHandler::focusDocumentView() bool EventHandler::passWidgetMouseDownEventToWidget(const MouseEventWithHitTestResults& event) { // Figure out which view to send the event to. - RenderObject* target = event.targetNode() ? event.targetNode()->renderer() : 0; + RenderObject* target = targetNode(event) ? targetNode(event)->renderer() : 0; if (!target || !target->isWidget()) return false; @@ -383,7 +381,7 @@ bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults& eve return true; case NSLeftMouseDown: { - Node* node = event.targetNode(); + Node* node = targetNode(event); if (!node) return false; RenderObject* renderer = node->renderer(); |