Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(466)

Unified Diff: third_party/WebKit/Source/core/input/EventHandler.cpp

Issue 2174863002: Change mouse pointer event targets to the capturing node (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Variable name change Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 0d12edaba07fdd4422f52c88d0470b388c743200..a8011432dd65c08d1aa5eae08831c6d8ef4699ba 100644
--- a/third_party/WebKit/Source/core/input/EventHandler.cpp
+++ b/third_party/WebKit/Source/core/input/EventHandler.cpp
@@ -1404,18 +1404,21 @@ MouseEventWithHitTestResults EventHandler::prepareMouseEvent(const HitTestReques
Node* EventHandler::updateMouseEventTargetNode(Node* targetNode,
const PlatformMouseEvent& mouseEvent)
{
- Node* result = targetNode;
+ Node* newNodeUnderMouse = targetNode;
// If we're capturing, we always go right to that node.
- if (m_capturingMouseEventsNode) {
- result = m_capturingMouseEventsNode.get();
+ if (EventTarget* mousePointerCapturingNode = m_pointerEventManager.getMouseCapturingNode()) {
+ newNodeUnderMouse = mousePointerCapturingNode->toNode();
+ DCHECK(newNodeUnderMouse);
+ } else if (m_capturingMouseEventsNode) {
+ newNodeUnderMouse = m_capturingMouseEventsNode.get();
} else {
// If the target node is a text node, dispatch on the parent node - rdar://4196646
- if (result && result->isTextNode())
- result = FlatTreeTraversal::parent(*result);
+ if (newNodeUnderMouse && newNodeUnderMouse->isTextNode())
+ newNodeUnderMouse = FlatTreeTraversal::parent(*newNodeUnderMouse);
}
Node* lastNodeUnderMouse = m_nodeUnderMouse;
- m_nodeUnderMouse = result;
+ m_nodeUnderMouse = newNodeUnderMouse;
PaintLayer* layerForLastNode = layerForNode(lastNodeUnderMouse);
PaintLayer* layerForNodeUnderMouse = layerForNode(m_nodeUnderMouse.get());
@@ -1505,9 +1508,12 @@ WebInputEventResult EventHandler::updatePointerTargetAndDispatchEvents(const Ato
if (mouseEvent.getSyntheticEventType() == PlatformMouseEvent::FromTouch)
return dispatchMouseEvent(mouseEventType, m_nodeUnderMouse, clickCount, mouseEvent);
- return m_pointerEventManager.sendMousePointerEvent(
+ Node* newNodeUnderMouse = nullptr;
+ const auto& eventResult = m_pointerEventManager.sendMousePointerEvent(
m_nodeUnderMouse, mouseEventType, clickCount, mouseEvent, nullptr,
- lastNodeUnderMouse);
+ lastNodeUnderMouse, &newNodeUnderMouse);
+ m_nodeUnderMouse = newNodeUnderMouse;
+ return eventResult;
}
void EventHandler::setClickNode(Node* node)

Powered by Google App Engine
This is Rietveld 408576698