Chromium Code Reviews| 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 d6bb3c72044dccffc99a3d96f7d5c24f33b11587..4d8292198b0c6c035c43144b2856fa65e83808dc 100644 |
| --- a/third_party/WebKit/Source/core/input/EventHandler.cpp |
| +++ b/third_party/WebKit/Source/core/input/EventHandler.cpp |
| @@ -309,7 +309,7 @@ void EventHandler::nodeWillBeRemoved(Node& nodeToBeRemoved) |
| void EventHandler::immediatelyProcessPendingPointerCapture(int pointerId) |
| { |
| - m_pointerEventManager.immediatelyProcessPendingPointerCapture(pointerId); |
| + m_pointerEventManager.processPendingPointerCapture(pointerId); |
| } |
| WebInputEventResult EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& event) |
| @@ -1411,7 +1411,10 @@ Node* EventHandler::updateMouseEventTargetNode(Node* targetNode, |
| Node* result = targetNode; |
|
mustaq
2016/07/22 16:01:01
s/result/newNodeUnderMouse
Navid Zolghadr
2016/07/22 16:39:23
Done.
|
| // If we're capturing, we always go right to that node. |
| - if (m_capturingMouseEventsNode) { |
| + if (EventTarget* tmp = m_pointerEventManager.getMouseCapturingNode()) { |
|
dtapuska
2016/07/22 15:57:39
You are going to have to use a better name than tm
Navid Zolghadr
2016/07/22 16:39:23
Done. :)
|
| + result = tmp->toNode(); |
| + DCHECK(result); |
| + } else if (m_capturingMouseEventsNode) { |
| result = m_capturingMouseEventsNode.get(); |
| } else { |
| // If the target node is a text node, dispatch on the parent node - rdar://4196646 |