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

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

Issue 2771463002: Revert "Send click event after pointer capturing retarget" (Closed)
Patch Set: Created 3 years, 9 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 e2a0d5bf3bbb4c2d36691f17314061db78f4c1e4..7aa5add669e37a05ce1449bde3033557ba3fb9a4 100644
--- a/third_party/WebKit/Source/core/input/EventHandler.cpp
+++ b/third_party/WebKit/Source/core/input/EventHandler.cpp
@@ -978,9 +978,10 @@ WebInputEventResult EventHandler::handleMouseReleaseEvent(
WebInputEventResult eventResult = updatePointerTargetAndDispatchEvents(
EventTypeNames::mouseup, mev.innerNode(), mev.canvasRegionId(),
- mev.event(), Vector<WebMouseEvent>(),
- !(selectionController().hasExtendedSelection() &&
- isSelectionOverLink(mev)));
+ mev.event(), Vector<WebMouseEvent>());
+
+ WebInputEventResult clickEventResult =
+ m_mouseEventManager->dispatchMouseClickIfNeeded(mev);
m_scrollManager->clearResizeScrollableArea(false);
@@ -990,7 +991,7 @@ WebInputEventResult EventHandler::handleMouseReleaseEvent(
m_mouseEventManager->invalidateClick();
- return eventResult;
+ return EventHandlingUtil::mergeEventResult(clickEventResult, eventResult);
}
static bool targetIsFrame(Node* target, LocalFrame*& frame) {
@@ -1217,15 +1218,14 @@ WebInputEventResult EventHandler::updatePointerTargetAndDispatchEvents(
Node* targetNode,
const String& canvasRegionId,
const WebMouseEvent& mouseEvent,
- const Vector<WebMouseEvent>& coalescedEvents,
- bool selectionOverLink) {
+ const Vector<WebMouseEvent>& coalescedEvents) {
ASSERT(mouseEventType == EventTypeNames::mousedown ||
mouseEventType == EventTypeNames::mousemove ||
mouseEventType == EventTypeNames::mouseup);
const auto& eventResult = m_pointerEventManager->sendMousePointerEvent(
updateMouseEventTargetNode(targetNode), canvasRegionId, mouseEventType,
- mouseEvent, coalescedEvents, selectionOverLink);
+ mouseEvent, coalescedEvents);
return eventResult;
}
« no previous file with comments | « third_party/WebKit/Source/core/input/EventHandler.h ('k') | third_party/WebKit/Source/core/input/MouseEventManager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698