Refactoring button field and its type

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
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 367 matching lines @@
     //    is on a mouse press. The problem is the <embed> node only starts
     //    capturing mouse events *after* m_mousePressed for the containing frame
     //    has already been set to true. As a result, the frame's EventHandler
     //    never sees the mouse release event, which is supposed to reset
     //    m_mousePressed... so m_mousePressed ends up remaining true until the
     //    event handler finally gets another mouse released event. Oops.
     // 2. Dragging doesn't start until after a mouse press event, but a drag
     //    that ends as a result of a mouse release does not send a mouse release
     //    event. As a result, m_mousePressed also ends up remaining true until
     //    the next mouse release event seen by the EventHandler.
-    if (event.event().button() != LeftButton)
+    if (event.event().pointerProperties().button != WebPointerProperties::Button::Left)
         m_mousePressed = false;
 
     if (!m_mousePressed)
         return WebInputEventResult::NotHandled;
 
     if (handleDrag(event, DragInitiator::Mouse))
         return WebInputEventResult::HandledSystem;
 
     Node* targetNode = event.innerNode();
     if (!targetNode)
@@ skipping 372 matching lines @@
     return view ? view->rootFrameToContents(pointInRootFrame) : pointInRootFrame;
 }
 
 WebInputEventResult EventHandler::handleMousePressEvent(const PlatformMouseEvent& mouseEvent)
 {
     TRACE_EVENT0("blink", "EventHandler::handleMousePressEvent");
 
     // For 4th/5th button in the mouse since Chrome does not yet send
     // button value to Blink but in some cases it does send the event.
     // This check is needed to suppress such an event (crbug.com/574959)
-    if (mouseEvent.button() == NoButton)
+    if (mouseEvent.pointerProperties().button == WebPointerProperties::Button::NoButton)
         return WebInputEventResult::HandledSuppressed;
 
     UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
     m_frame->localFrameRoot()->eventHandler().m_lastMouseDownUserGestureToken = UserGestureIndicator::currentToken();
 
     cancelFakeMouseMoveEvent();
     if (m_eventHandlerWillResetCapturingMouseEventsNode)
         m_capturingMouseEventsNode = nullptr;
     m_mousePressed = true;
     m_capturesDragging = true;
@@ skipping 101 matching lines @@
             HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active);
             mev = m_frame->document()->prepareMouseEvent(request, documentPoint, mouseEvent);
         }
 
         if (passMousePressEventToScrollbar(mev))
             eventResult = WebInputEventResult::HandledSystem;
         else
             eventResult = handleMousePressEvent(mev);
     }
 
-    if (mev.hitTestResult().innerNode() && mouseEvent.button() == LeftButton) {
+    if (mev.hitTestResult().innerNode() && mouseEvent.pointerProperties().button == WebPointerProperties::Button::Left) {
         ASSERT(mouseEvent.type() == PlatformEvent::MousePressed);
         HitTestResult result = mev.hitTestResult();
         result.setToShadowHostIfInUserAgentShadowRoot();
         m_frame->chromeClient().onMouseDown(result.innerNode());
     }
 
     return eventResult;
 }
 
 static PaintLayer* layerForNode(Node* node)
@@ skipping 179 matching lines @@
     return FlatTreeTraversal::parent(node);
 }
 
 WebInputEventResult EventHandler::handleMouseReleaseEvent(const PlatformMouseEvent& mouseEvent)
 {
     TRACE_EVENT0("blink", "EventHandler::handleMouseReleaseEvent");
 
     // For 4th/5th button in the mouse since Chrome does not yet send
     // button value to Blink but in some cases it does send the event.
     // This check is needed to suppress such an event (crbug.com/574959)
-    if (mouseEvent.button() == NoButton)
+    if (mouseEvent.pointerProperties().button == WebPointerProperties::Button::NoButton)
         return WebInputEventResult::HandledSuppressed;
 
     if (!mouseEvent.fromTouch())
         m_frame->selection().setCaretBlinkingSuspended(false);
 
     std::unique_ptr<UserGestureIndicator> gestureIndicator;
 
     if (m_frame->localFrameRoot()->eventHandler().m_lastMouseDownUserGestureToken)
         gestureIndicator = wrapUnique(new UserGestureIndicator(m_frame->localFrameRoot()->eventHandler().m_lastMouseDownUserGestureToken.release()));
     else
@@ skipping 29 matching lines @@
     HitTestRequest request(hitType);
     MouseEventWithHitTestResults mev = prepareMouseEvent(request, mouseEvent);
     LocalFrame* subframe = m_capturingMouseEventsNode.get() ? subframeForTargetNode(m_capturingMouseEventsNode.get()) : subframeForHitTestResult(mev);
     if (m_eventHandlerWillResetCapturingMouseEventsNode)
         m_capturingMouseEventsNode = nullptr;
     if (subframe)
         return passMouseReleaseEventToSubframe(mev, subframe);
 
     WebInputEventResult eventResult = updatePointerTargetAndDispatchEvents(EventTypeNames::mouseup, mev.innerNode(), m_clickCount, mev.event());
 
-    bool contextMenuEvent = mouseEvent.button() == RightButton;
+    bool contextMenuEvent = mouseEvent.pointerProperties().button == WebPointerProperties::Button::Right;
 #if OS(MACOSX)
     // FIXME: The Mac port achieves the same behavior by checking whether the context menu is currently open in WebPage::mouseEvent(). Consider merging the implementations.
-    if (mouseEvent.button() == LeftButton && mouseEvent.getModifiers() & PlatformEvent::CtrlKey)
+    if (mouseEvent.pointerProperties().button == WebPointerProperties::Button::Left
+        && mouseEvent.getModifiers() & PlatformEvent::CtrlKey)
         contextMenuEvent = true;
 #endif
 
     WebInputEventResult clickEventResult = WebInputEventResult::NotHandled;
     const bool shouldDispatchClickEvent = m_clickCount > 0
         && !contextMenuEvent
         && mev.innerNode() && m_clickNode
         && mev.innerNode()->canParticipateInFlatTree() && m_clickNode->canParticipateInFlatTree()
         && !(selectionController().hasExtendedSelection() && isLinkSelection(mev));
     if (shouldDispatchClickEvent) {
@@ skipping 341 matching lines @@
         || mouseEventType == EventTypeNames::mousemove
         || mouseEventType == EventTypeNames::mouseup);
 
     Node* lastNodeUnderMouse = updateMouseEventTargetNode(targetNode, mouseEvent);
 
     if (mouseEvent.getSyntheticEventType() == PlatformMouseEvent::FromTouch)
         return dispatchMouseEvent(mouseEventType, m_nodeUnderMouse, clickCount, mouseEvent);
 
     Node* newNodeUnderMouse = nullptr;
     const auto& eventResult = m_pointerEventManager.sendMousePointerEvent(
-        m_nodeUnderMouse, mouseEventType, clickCount, mouseEvent, nullptr,
+        m_nodeUnderMouse, mouseEventType, clickCount, mouseEvent,
         lastNodeUnderMouse, &newNodeUnderMouse);
     m_nodeUnderMouse = newNodeUnderMouse;
     return eventResult;
 }
 
 void EventHandler::setClickNode(Node* node)
 {
     m_clickNode = node;
 }
 
@@ skipping 357 matching lines @@
                 exitedFrameChain.append(exitedFrameInDocument);
             else if (nextExitedFrameInDocument && indexEnteredFrameChain)
                 --indexEnteredFrameChain;
         }
         exitedFrameInDocument = nextExitedFrameInDocument;
     }
 
     const PlatformGestureEvent& gestureEvent = targetedEvent.event();
     unsigned modifiers = gestureEvent.getModifiers();
     PlatformMouseEvent fakeMouseMove(gestureEvent.position(), gestureEvent.globalPosition(),
-        NoButton, PlatformEvent::MouseMoved, /* clickCount */ 0,
+        WebPointerProperties::Button::NoButton, PlatformEvent::MouseMoved, /* clickCount */ 0,
         static_cast<PlatformEvent::Modifiers>(modifiers),
         PlatformMouseEvent::FromTouch, gestureEvent.timestamp(), WebPointerProperties::PointerType::Mouse);
 
     // Update the mouseout/mouseleave event
     size_t indexExitedFrameChain = exitedFrameChain.size();
     while (indexExitedFrameChain) {
         LocalFrame* leaveFrame = exitedFrameChain[--indexExitedFrameChain];
         leaveFrame->eventHandler().updateMouseEventTargetNodeAndSendEvents(nullptr, fakeMouseMove);
     }
 
@@ skipping 187 matching lines @@
     result.setInnerNode(targetNode);
     doc->updateHoverActiveState(request, result.innerElement());
 
     // The contextmenu event is a mouse event even when invoked using the keyboard.
     // This is required for web compatibility.
     PlatformEvent::EventType eventType = PlatformEvent::MousePressed;
     if (m_frame->settings() && m_frame->settings()->showContextMenuOnMouseUp())
         eventType = PlatformEvent::MouseReleased;
 
     PlatformMouseEvent mouseEvent(locationInRootFrame, globalPosition,
-        RightButton, eventType, 1,
+        WebPointerProperties::Button::Right, eventType, 1,
         PlatformEvent::NoModifiers, PlatformMouseEvent::RealOrIndistinguishable,
         WTF::monotonicallyIncreasingTime(), WebPointerProperties::PointerType::Mouse);
 
     return sendContextMenuEvent(mouseEvent, overrideTargetElement);
 }
 
 void EventHandler::scheduleHoverStateUpdate()
 {
     if (!m_hoverTimer.isActive())
         m_hoverTimer.startOneShot(0, BLINK_FROM_HERE);
@@ skipping 59 matching lines @@
     if (!view)
         return;
 
     if (!m_frame->page() || !m_frame->page()->focusController().isActive())
         return;
 
     // Don't dispatch a synthetic mouse move event if the mouse cursor is not visible to the user.
     if (!isCursorVisible())
         return;
 
-    PlatformMouseEvent fakeMouseMoveEvent(m_lastKnownMousePosition, m_lastKnownMouseGlobalPosition, NoButton, PlatformEvent::MouseMoved, 0, PlatformKeyboardEvent::getCurrentModifierState(), PlatformMouseEvent::RealOrIndistinguishable, monotonicallyIncreasingTime(), WebPointerProperties::PointerType::Mouse);
+    PlatformMouseEvent fakeMouseMoveEvent(m_lastKnownMousePosition, m_lastKnownMouseGlobalPosition, WebPointerProperties::Button::NoButton, PlatformEvent::MouseMoved, 0, PlatformKeyboardEvent::getCurrentModifierState(), PlatformMouseEvent::RealOrIndistinguishable, monotonicallyIncreasingTime(), WebPointerProperties::PointerType::Mouse);
     handleMouseMoveEvent(fakeMouseMoveEvent);
 }
 
 void EventHandler::cancelFakeMouseMoveEvent()
 {
     m_fakeMouseMoveEventTimer.stop();
 }
 
 bool EventHandler::isCursorVisible() const
 {
@@ skipping 136 matching lines @@
 
 bool EventHandler::handleDragDropIfPossible(const GestureEventWithHitTestResults& targetedEvent)
 {
     if (m_frame->settings() && m_frame->settings()->touchDragDropEnabled() && m_frame->view()) {
         const PlatformGestureEvent& gestureEvent = targetedEvent.event();
         IntPoint adjustedPoint = gestureEvent.position();
         unsigned modifiers = gestureEvent.getModifiers();
 
         // TODO(mustaq): Suppressing long-tap MouseEvents could break
         // drag-drop. Will do separately because of the risk. crbug.com/606938.
-        PlatformMouseEvent mouseDownEvent(adjustedPoint, gestureEvent.globalPosition(), LeftButton, PlatformEvent::MousePressed, 1,
+        PlatformMouseEvent mouseDownEvent(adjustedPoint, gestureEvent.globalPosition(), WebPointerProperties::Button::Left, PlatformEvent::MousePressed, 1,
             static_cast<PlatformEvent::Modifiers>(modifiers | PlatformEvent::LeftButtonDown),
             PlatformMouseEvent::FromTouch, WTF::monotonicallyIncreasingTime(), WebPointerProperties::PointerType::Mouse);
         m_mouseDown = mouseDownEvent;
 
-        PlatformMouseEvent mouseDragEvent(adjustedPoint, gestureEvent.globalPosition(), LeftButton, PlatformEvent::MouseMoved, 1,
+        PlatformMouseEvent mouseDragEvent(adjustedPoint, gestureEvent.globalPosition(), WebPointerProperties::Button::Left, PlatformEvent::MouseMoved, 1,
             static_cast<PlatformEvent::Modifiers>(modifiers | PlatformEvent::LeftButtonDown),
             PlatformMouseEvent::FromTouch, WTF::monotonicallyIncreasingTime(), WebPointerProperties::PointerType::Mouse);
         HitTestRequest request(HitTestRequest::ReadOnly);
         MouseEventWithHitTestResults mev = prepareMouseEvent(request, mouseDragEvent);
         m_mouseDownMayStartDrag = true;
         dragState().m_dragSrc = nullptr;
         m_mouseDownPos = m_frame->view()->rootFrameToContents(mouseDragEvent.position());
         return handleDrag(mev, DragInitiator::Touch);
     }
     return false;
@@ skipping 235 matching lines @@
 
 FrameHost* EventHandler::frameHost() const
 {
     if (!m_frame->page())
         return nullptr;
 
     return &m_frame->page()->frameHost();
 }
 
 } // namespace blink