Revert "Send click event after pointer capturing retarget"

third_party/WebKit/Source/core/input/EventHandler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 960 matching lines @@
         m_frame->localFrameRoot()
             ->eventHandler()
             .m_lastMouseDownUserGestureToken.release()));
   } else {
     gestureIndicator = WTF::wrapUnique(new UserGestureIndicator(
         DocumentUserGestureToken::create(m_frame->document())));
   }
 
   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);
 
   if (eventResult == WebInputEventResult::NotHandled)
     eventResult = m_mouseEventManager->handleMouseReleaseEvent(mev);
   m_mouseEventManager->clearDragHeuristicState();
 
   m_mouseEventManager->invalidateClick();
 
-  return eventResult;
+  return EventHandlingUtil::mergeEventResult(clickEventResult, eventResult);
 }
 
 static bool targetIsFrame(Node* target, LocalFrame*& frame) {
   if (!isHTMLFrameElementBase(target))
     return false;
 
   // Cross-process drag and drop is not yet supported.
   if (toHTMLFrameElementBase(target)->contentFrame() &&
       !toHTMLFrameElementBase(target)->contentFrame()->isLocalFrame())
     return false;
@@ skipping 206 matching lines @@
 
 void EventHandler::elementRemoved(EventTarget* target) {
   m_pointerEventManager->elementRemoved(target);
 }
 
 WebInputEventResult EventHandler::updatePointerTargetAndDispatchEvents(
     const AtomicString& mouseEventType,
     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;
 }
 
 WebInputEventResult EventHandler::handleWheelEvent(
     const WebMouseWheelEvent& event) {
 #if OS(MACOSX)
   // Filter Mac OS specific phases, usually with a zero-delta.
   // https://crbug.com/553732
   // TODO(chongz): EventSender sends events with
   // |WebMouseWheelEvent::PhaseNone|,
@@ skipping 855 matching lines @@
 }
 
 FrameHost* EventHandler::frameHost() const {
   if (!m_frame->page())
     return nullptr;
 
   return &m_frame->page()->frameHost();
 }
 
 }  // namespace blink