| Index: third_party/WebKit/Source/core/input/EventHandler.cpp
|
| diff --git a/third_party/WebKit/Source/core/input/EventHandler.cpp b/third_party/WebKit/Source/core/input/EventHandler.cpp
|
| index 645d51be8477559971abd6939f700eb84dfff90a..7301ed12126efff7ade5e5b8c720ee1577cf9dba 100644
|
| --- a/third_party/WebKit/Source/core/input/EventHandler.cpp
|
| +++ b/third_party/WebKit/Source/core/input/EventHandler.cpp
|
| @@ -1256,7 +1256,7 @@ WebInputEventResult EventHandler::handleMouseMoveOrLeaveEvent(const PlatformMous
|
|
|
| if (newSubframe) {
|
| // Update over/out state before passing the event to the subframe.
|
| - updateMouseEventTargetNode(mev.innerNode(), mev.event());
|
| + updateMouseEventTargetNode(mev.innerNode(), mev.event(), true);
|
|
|
| // Event dispatch in updateMouseEventTargetNode may have caused the subframe of the target
|
| // node to be detached from its FrameView, in which case the event should not be passed.
|
| @@ -1590,7 +1590,8 @@ MouseEventWithHitTestResults EventHandler::prepareMouseEvent(const HitTestReques
|
| return m_frame->document()->prepareMouseEvent(request, contentPointFromRootFrame(m_frame, mev.position()), mev);
|
| }
|
|
|
| -void EventHandler::updateMouseEventTargetNode(Node* targetNode, const PlatformMouseEvent& mouseEvent)
|
| +void EventHandler::updateMouseEventTargetNode(Node* targetNode,
|
| + const PlatformMouseEvent& mouseEvent, bool setPointerPosition)
|
| {
|
| Node* result = targetNode;
|
|
|
| @@ -1639,7 +1640,8 @@ void EventHandler::updateMouseEventTargetNode(Node* targetNode, const PlatformMo
|
| }
|
|
|
| m_pointerEventManager.sendNodeTransitionEvents(lastNodeUnderMouse,
|
| - m_nodeUnderMouse, mouseEvent, m_frame->document()->domWindow());
|
| + m_nodeUnderMouse, mouseEvent, m_frame->document()->domWindow(),
|
| + setPointerPosition);
|
| }
|
|
|
| WebInputEventResult EventHandler::dispatchMouseEvent(const AtomicString& eventType, Node* targetNode, int clickCount, const PlatformMouseEvent& mouseEvent)
|
| @@ -1681,8 +1683,6 @@ WebInputEventResult EventHandler::updatePointerTargetAndDispatchEvents(const Ato
|
| || mouseEventType == EventTypeNames::mouseup);
|
|
|
| updateMouseEventTargetNode(targetNode, mouseEvent);
|
| - if (!m_nodeUnderMouse)
|
| - return WebInputEventResult::NotHandled;
|
|
|
| return m_pointerEventManager.sendMousePointerEvent(
|
| m_nodeUnderMouse, mouseEventType, clickCount, mouseEvent, nullptr,
|
|
|