Refactoring button field and its type

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 126 matching lines @@
     HitTestResult currentHitTest = targetedEvent.hitTestResult();
 
     // We use the adjusted position so the application isn't surprised to see a event with
     // co-ordinates outside the target's bounds.
     IntPoint adjustedPoint = frameView->rootFrameToContents(gestureEvent.position());
 
     const unsigned modifiers = gestureEvent.getModifiers();
 
     if (!m_suppressMouseEventsFromGestures) {
         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);
         m_frame->eventHandler().dispatchMouseEvent(EventTypeNames::mousemove, currentHitTest.innerNode(), 0, fakeMouseMove);
     }
 
     // Do a new hit-test in case the mousemove event changed the DOM.
     // Note that if the original hit test wasn't over an element (eg. was over a scrollbar) we
     // don't want to re-hit-test because it may be in the wrong frame (and there's no way the page
     // could have seen the event anyway).
     // Also note that the position of the frame may have changed, so we need to recompute the content
@@ skipping 11 matching lines @@
     Node* tappedNode = currentHitTest.innerNode();
     IntPoint tappedPosition = gestureEvent.position();
     Node* tappedNonTextNode = tappedNode;
 
     if (tappedNonTextNode && tappedNonTextNode->isTextNode())
         tappedNonTextNode = FlatTreeTraversal::parent(*tappedNonTextNode);
 
     m_frame->eventHandler().setClickNode(tappedNonTextNode);
 
     PlatformMouseEvent fakeMouseDown(gestureEvent.position(), gestureEvent.globalPosition(),
-        LeftButton, PlatformEvent::MousePressed, gestureEvent.tapCount(),
+        WebPointerProperties::Button::Left, PlatformEvent::MousePressed, gestureEvent.tapCount(),
         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)
@@ skipping 12 matching lines @@
     // FIXME: Use a hit-test cache to avoid unnecessary hit tests. http://crbug.com/398920
     if (currentHitTest.innerNode()) {
         LocalFrame* mainFrame = m_frame->localFrameRoot();
         if (mainFrame && mainFrame->view())
             mainFrame->view()->updateAllLifecyclePhases();
         adjustedPoint = frameView->rootFrameToContents(gestureEvent.position());
         currentHitTest = EventHandler::hitTestResultInFrame(m_frame, adjustedPoint, hitType);
     }
 
     PlatformMouseEvent fakeMouseUp(gestureEvent.position(), gestureEvent.globalPosition(),
-        LeftButton, PlatformEvent::MouseReleased, gestureEvent.tapCount(),
+        WebPointerProperties::Button::Left, PlatformEvent::MouseReleased, gestureEvent.tapCount(),
         static_cast<PlatformEvent::Modifiers>(modifiers),
         PlatformMouseEvent::FromTouch, gestureEvent.timestamp(), WebPointerProperties::PointerType::Mouse);
     WebInputEventResult mouseUpEventResult = m_suppressMouseEventsFromGestures
         ? WebInputEventResult::HandledSuppressed
         : m_frame->eventHandler().dispatchMouseEvent(EventTypeNames::mouseup, currentHitTest.innerNode(), gestureEvent.tapCount(), fakeMouseUp);
 
     WebInputEventResult clickEventResult = WebInputEventResult::NotHandled;
     if (tappedNonTextNode) {
         if (currentHitTest.innerNode()) {
             // Updates distribution because a mouseup (or mousedown) event listener can make the
@@ skipping 63 matching lines @@
 }
 
 WebInputEventResult GestureManager::sendContextMenuEventForGesture(const GestureEventWithHitTestResults& targetedEvent)
 {
     const PlatformGestureEvent& gestureEvent = targetedEvent.event();
     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,
+            WebPointerProperties::Button::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);
     }
 
     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,
+    PlatformMouseEvent mouseEvent(targetedEvent.event().position(), targetedEvent.event().globalPosition(), WebPointerProperties::Button::Right, 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);
     }
 
     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.
@@ skipping 26 matching lines @@
 
     return &m_frame->page()->frameHost();
 }
 
 double GestureManager::getLastShowPressTimestamp() const
 {
     return m_lastShowPressTimestamp;
 }
 
 } // namespace blink