Fixed & refactored mouse event firing at gesture context menu

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/input/GestureManager.h"
 
 #include "core/dom/Document.h"
 #include "core/editing/SelectionController.h"
 #include "core/events/GestureEvent.h"
 #include "core/frame/FrameHost.h"
@@ skipping 169 matching lines @@
         static_cast<PlatformEvent::Modifiers>(modifiers | PlatformEvent::LeftButtonDown),
         PlatformMouseEvent::FromTouch, gestureEvent.timestamp(), WebPointerProperties::PointerType::Mouse);
 
     // TODO(mustaq): We suppress MEs plus all it's side effects. What would that
     // mean for for TEs?  What's the right balance here? crbug.com/617255
     WebInputEventResult mouseDownEventResult = WebInputEventResult::HandledSuppressed;
     if (!m_suppressMouseEventsFromGestures) {
         mouseDownEventResult = m_frame->eventHandler().dispatchMouseEvent(EventTypeNames::mousedown, currentHitTest.innerNode(), gestureEvent.tapCount(), fakeMouseDown);
         m_selectionController->initializeSelectionState();
         if (mouseDownEventResult == WebInputEventResult::NotHandled)
-            mouseDownEventResult = m_frame->eventHandler().handleMouseFocus(MouseEventWithHitTestResults(fakeMouseDown, currentHitTest), InputDeviceCapabilities::firesTouchEventsSourceCapabilities());
+            mouseDownEventResult = m_frame->eventHandler().handleMouseFocus(currentHitTest, InputDeviceCapabilities::firesTouchEventsSourceCapabilities());
         if (mouseDownEventResult == WebInputEventResult::NotHandled)
             mouseDownEventResult = m_frame->eventHandler().handleMousePressEvent(MouseEventWithHitTestResults(fakeMouseDown, currentHitTest));
     }
 
     if (currentHitTest.innerNode()) {
         DCHECK(gestureEvent.type() == PlatformEvent::GestureTap);
         HitTestResult result = currentHitTest;
         result.setToShadowHostIfInUserAgentShadowRoot();
         m_frame->chromeClient().onMouseDown(result.innerNode());
     }
@@ skipping 90 matching lines @@
     unsigned modifiers = gestureEvent.getModifiers();
 
     if (!m_suppressMouseEventsFromGestures) {
         // Send MouseMoved event prior to handling (https://crbug.com/485290).
         PlatformMouseEvent fakeMouseMove(gestureEvent.position(), gestureEvent.globalPosition(),
             NoButton, PlatformEvent::MouseMoved, /* clickCount */ 0,
             static_cast<PlatformEvent::Modifiers>(modifiers),
             PlatformMouseEvent::FromTouch, gestureEvent.timestamp(), WebPointerProperties::PointerType::Mouse);
         m_frame->eventHandler().dispatchMouseEvent(
             EventTypeNames::mousemove, targetedEvent.hitTestResult().innerNode(), 0, fakeMouseMove);
+
+        if (m_frame->view()) {
+            HitTestRequest request(HitTestRequest::Active);
+            LayoutPoint documentPoint = m_frame->view()->rootFrameToContents(targetedEvent.event().position());
+            HitTestResult hitTestResult(request, documentPoint);
+            m_frame->eventHandler().handleMouseFocus(hitTestResult, InputDeviceCapabilities::firesTouchEventsSourceCapabilities());
+        }
     }
 
     PlatformEvent::EventType eventType = PlatformEvent::MousePressed;
     if (m_frame->settings() && m_frame->settings()->showContextMenuOnMouseUp())
         eventType = PlatformEvent::MouseReleased;
 
-    // To simulate right-click behavior, we send a right mouse down and then context menu event.
-    // TODO(crbug.com/579564): Maybe we should not send mouse down at all
-    PlatformMouseEvent mouseEvent(targetedEvent.event().position(), targetedEvent.event().globalPosition(), RightButton, eventType, 1,
-        static_cast<PlatformEvent::Modifiers>(modifiers | PlatformEvent::RightButtonDown),
-        PlatformMouseEvent::FromTouch, WTF::monotonicallyIncreasingTime(), WebPointerProperties::PointerType::Mouse);
-    if (!m_suppressMouseEventsFromGestures) {
-        // FIXME: Send HitTestResults to avoid redundant hit tests.
-        m_frame->eventHandler().handleMousePressEvent(mouseEvent);
-    }
+    PlatformMouseEvent mouseEvent(targetedEvent.event().position(), targetedEvent.event().globalPosition(), NoButton,
+        eventType, /* clickCount */ 0, static_cast<PlatformEvent::Modifiers>(modifiers), PlatformMouseEvent::FromTouch,
+        WTF::monotonicallyIncreasingTime(), WebPointerProperties::PointerType::Mouse);
 
     return m_frame->eventHandler().sendContextMenuEvent(mouseEvent);
-    // We do not need to send a corresponding mouse release because in case of
-    // right-click, the context menu takes capture and consumes all events.
 }
 
 WebInputEventResult GestureManager::handleGestureShowPress()
 {
     m_lastShowPressTimestamp = WTF::monotonicallyIncreasingTime();
 
     FrameView* view = m_frame->view();
     if (!view)
         return WebInputEventResult::NotHandled;
     if (ScrollAnimatorBase* scrollAnimator = view->existingScrollAnimator())
@@ skipping 16 matching lines @@
 
     return &m_frame->page()->frameHost();
 }
 
 double GestureManager::getLastShowPressTimestamp() const
 {
     return m_lastShowPressTimestamp;
 }
 
 } // namespace blink