From 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 2 Jun 2011 12:07:03 +0100 Subject: Merge WebKit at r84325: Initial merge by git. Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b --- Source/WebCore/page/chromium/EventHandlerChromium.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/WebCore/page/chromium') diff --git a/Source/WebCore/page/chromium/EventHandlerChromium.cpp b/Source/WebCore/page/chromium/EventHandlerChromium.cpp index 09b4dfa..faf4d47 100644 --- a/Source/WebCore/page/chromium/EventHandlerChromium.cpp +++ b/Source/WebCore/page/chromium/EventHandlerChromium.cpp @@ -61,7 +61,7 @@ bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& m IntPoint p = m_frame->view()->windowToContents(mev.event().pos()); if (m_frame->selection()->contains(p)) { VisiblePosition visiblePos( - mev.targetNode()->renderer()->positionForPoint(mev.localPoint())); + targetNode(mev)->renderer()->positionForPoint(mev.localPoint())); VisibleSelection newSelection(visiblePos); if (m_frame->selection()->shouldChangeSelection(newSelection)) m_frame->selection()->setSelection(newSelection); @@ -103,9 +103,9 @@ bool EventHandler::passWheelEventToWidget(PlatformWheelEvent& wheelEvent, Widget bool EventHandler::passWidgetMouseDownEventToWidget(const MouseEventWithHitTestResults& event) { // Figure out which view to send the event to. - if (!event.targetNode() || !event.targetNode()->renderer() || !event.targetNode()->renderer()->isWidget()) + if (!targetNode(event) || !targetNode(event)->renderer() || !targetNode(event)->renderer()->isWidget()) return false; - return passMouseDownEventToWidget(toRenderWidget(event.targetNode()->renderer())->widget()); + return passMouseDownEventToWidget(toRenderWidget(targetNode(event)->renderer())->widget()); } bool EventHandler::passMouseDownEventToWidget(Widget* widget) -- cgit v1.1