Set right button for mousedown/contextmenu of long press gesture

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 342 matching lines @@
         gestureEvent.position(), gestureEvent.globalPosition(),
         WebPointerProperties::Button::NoButton, PlatformEvent::MouseMoved,
         /* clickCount */ 0, static_cast<PlatformEvent::Modifiers>(modifiers),
         PlatformMouseEvent::FromTouch, gestureEvent.timestamp(),
         WebPointerProperties::PointerType::Mouse);
     m_mouseEventManager->setMousePositionAndDispatchMouseEvent(
         targetedEvent.hitTestResult().innerNode(), EventTypeNames::mousemove,
         fakeMouseMove);
   }
 
-  PlatformEvent::EventType eventType = PlatformEvent::MousePressed;
-  if (m_frame->settings() && m_frame->settings()->showContextMenuOnMouseUp())
-    eventType = PlatformEvent::MouseReleased;
   PlatformMouseEvent mouseEvent(
       targetedEvent.event().position(), targetedEvent.event().globalPosition(),
-      WebPointerProperties::Button::NoButton, eventType, /* clickCount */ 0,
-      static_cast<PlatformEvent::Modifiers>(modifiers),
+      WebPointerProperties::Button::NoButton, PlatformEvent::MousePressed,
+      /* clickCount */ 1,
+      static_cast<PlatformEvent::Modifiers>(
+          modifiers | PlatformEvent::Modifiers::RightButtonDown),
       PlatformMouseEvent::FromTouch, WTF::monotonicallyIncreasingTime(),
       WebPointerProperties::PointerType::Mouse);
 
   if (!m_suppressMouseEventsFromGestures && m_frame->view()) {
     HitTestRequest request(HitTestRequest::Active);
     LayoutPoint documentPoint =
         m_frame->view()->rootFrameToContents(targetedEvent.event().position());
     MouseEventWithHitTestResults mev =
         m_frame->document()->performMouseEventHitTest(request, documentPoint,
                                                       mouseEvent);
 
     WebInputEventResult eventResult =
         m_mouseEventManager->setMousePositionAndDispatchMouseEvent(
             mev.innerNode(), EventTypeNames::mousedown, mouseEvent);
 
     if (eventResult == WebInputEventResult::NotHandled)
       eventResult = m_mouseEventManager->handleMouseFocus(
           mev.hitTestResult(),
           InputDeviceCapabilities::firesTouchEventsSourceCapabilities());
 
     if (eventResult == WebInputEventResult::NotHandled)
       m_mouseEventManager->handleMousePressEvent(mev);
+
+    if (m_frame->settings() &&
+        m_frame->settings()->showContextMenuOnMouseUp()) {
+      m_mouseEventManager->setMousePositionAndDispatchMouseEvent(
+          mev.innerNode(), EventTypeNames::mouseup, mouseEvent);
+      m_mouseEventManager->setClickNode(mev.innerNode());
+      m_mouseEventManager->setClickCount(1);
+      m_mouseEventManager->dispatchMouseClickIfNeeded(mev);
+      return m_frame->eventHandler().sendContextMenuEvent(mouseEvent);
+    }
+    WebInputEventResult result =
+        m_frame->eventHandler().sendContextMenuEvent(mouseEvent);
+    if (result != WebInputEventResult::NotHandled) {
+      m_mouseEventManager->setMousePositionAndDispatchMouseEvent(
+          mev.innerNode(), EventTypeNames::mouseup, mouseEvent);
+      m_mouseEventManager->setClickNode(mev.innerNode());
+      m_mouseEventManager->setClickCount(1);
+      m_mouseEventManager->dispatchMouseClickIfNeeded(mev);

[Navid Zolghadr, 2016/10/25 20:12:37]

Do you think these few lines are worth adding a new function?

+    }
+    return result;
   }
-
   return m_frame->eventHandler().sendContextMenuEvent(mouseEvent);
 }
 
 WebInputEventResult GestureManager::handleGestureShowPress() {
   m_lastShowPressTimestamp = WTF::monotonicallyIncreasingTime();
 
   FrameView* view = m_frame->view();
   if (!view)
     return WebInputEventResult::NotHandled;
   if (ScrollAnimatorBase* scrollAnimator = view->existingScrollAnimator())
@@ skipping 14 matching lines @@
     return nullptr;
 
   return &m_frame->page()->frameHost();
 }
 
 double GestureManager::getLastShowPressTimestamp() const {
   return m_lastShowPressTimestamp;
 }
 
 }  // namespace blink