Refactoring button field and its type

third_party/WebKit/Source/web/WebInputEventConversion.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 88 matching lines @@
     static_assert(PlatformEvent::DispatchType::ListenersNonBlockingPassive == static_cast<PlatformEvent::DispatchType>(WebInputEvent::DispatchType::ListenersNonBlockingPassive),
         "Dispatch Types not equal");
     static_assert(PlatformEvent::DispatchType::ListenersForcedNonBlockingPassive == static_cast<PlatformEvent::DispatchType>(WebInputEvent::DispatchType::ListenersForcedNonBlockingPassive),
         "Dispatch Types not equal");
 
     return static_cast<PlatformEvent::DispatchType>(type);
 }
 
 unsigned toPlatformModifierFrom(WebMouseEvent::Button button)
 {
-    if (button == WebMouseEvent::ButtonNone)
+    if (button == WebMouseEvent::Button::NoButton)
         return 0;
 
     unsigned webMouseButtonToPlatformModifier[] = {
         PlatformEvent::LeftButtonDown,
         PlatformEvent::MiddleButtonDown,
         PlatformEvent::RightButtonDown
     };
 
-    return webMouseButtonToPlatformModifier[button];
+    return webMouseButtonToPlatformModifier[static_cast<int>(button)];
 }
 
 ScrollGranularity toPlatformScrollGranularity(WebGestureEvent::ScrollUnits units)
 {
     switch (units) {
     case WebGestureEvent::ScrollUnits::PrecisePixels:
         return ScrollGranularity::ScrollByPrecisePixel;
     case WebGestureEvent::ScrollUnits::Pixels:
         return ScrollGranularity::ScrollByPixel;
     case WebGestureEvent::ScrollUnits::Page:
@@ skipping 41 matching lines @@
 // MakePlatformMouseEvent -----------------------------------------------------
 
 // TODO(mustaq): Add tests for this.
 PlatformMouseEventBuilder::PlatformMouseEventBuilder(Widget* widget, const WebMouseEvent& e)
 {
     // FIXME: Widget is always toplevel, unless it's a popup. We may be able
     // to get rid of this once we abstract popups into a WebKit API.
     m_position = widget->convertFromRootFrame(flooredIntPoint(convertHitPointToRootFrame(widget, IntPoint(e.x, e.y))));
     m_globalPosition = IntPoint(e.globalX, e.globalY);
     m_movementDelta = IntPoint(scaleDeltaToWindow(widget, e.movementX), scaleDeltaToWindow(widget, e.movementY));
-    m_button = static_cast<MouseButton>(e.button);
     m_modifiers = e.modifiers;
 
     m_timestamp = e.timeStampSeconds;
     m_clickCount = e.clickCount;
 
     m_pointerProperties = static_cast<WebPointerProperties>(e);
 
     switch (e.type) {
     case WebInputEvent::MouseMove:
     case WebInputEvent::MouseEnter: // synthesize a move event
@@ skipping 345 matching lines @@
     else if (event.type() == EventTypeNames::mouseup)
         type = WebInputEvent::MouseUp;
     else if (event.type() == EventTypeNames::contextmenu)
         type = WebInputEvent::ContextMenu;
     else
         return; // Skip all other mouse events.
 
     updateWebMouseEventFromCoreMouseEvent(event, widget, layoutItem, *this);
 
     switch (event.button()) {
-    case LeftButton:
-        button = WebMouseEvent::ButtonLeft;
+    case short(WebPointerProperties::Button::Left):
+        button = WebMouseEvent::Button::Left;
         break;
-    case MiddleButton:
-        button = WebMouseEvent::ButtonMiddle;
+    case short(WebPointerProperties::Button::Middle):
+        button = WebMouseEvent::Button::Middle;
         break;
-    case RightButton:
-        button = WebMouseEvent::ButtonRight;
+    case short(WebPointerProperties::Button::Right):
+        button = WebMouseEvent::Button::Right;
         break;
     }
     if (event.buttonDown()) {
         switch (event.button()) {
-        case LeftButton:
+        case short(WebPointerProperties::Button::Left):
             modifiers |= WebInputEvent::LeftButtonDown;
             break;
-        case MiddleButton:
+        case short(WebPointerProperties::Button::Middle):
             modifiers |= WebInputEvent::MiddleButtonDown;
             break;
-        case RightButton:
+        case short(WebPointerProperties::Button::Right):
             modifiers |= WebInputEvent::RightButtonDown;
             break;
         }
-    } else
-        button = WebMouseEvent::ButtonNone;
+    } else {
+        button = WebMouseEvent::Button::NoButton;
+    }
     movementX = event.movementX();
     movementY = event.movementY();
     clickCount = event.detail();
 
     pointerType = WebPointerProperties::PointerType::Mouse;
 }
 
 // Generate a synthetic WebMouseEvent given a TouchEvent (eg. for emulating a mouse
 // with touch input for plugins that don't support touch input).
 WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const LayoutItem layoutItem, const TouchEvent& event)
@@ skipping 26 matching lines @@
     // FIXME: if view == nullptr, pointInRootFrame will really be pointInRootContent.
     IntPoint pointInRootFrame = roundedIntPoint(touch->absoluteLocation());
     if (view)
         pointInRootFrame = view->contentsToRootFrame(pointInRootFrame);
     IntPoint screenPoint = roundedIntPoint(touch->screenLocation());
     globalX = screenPoint.x();
     globalY = screenPoint.y();
     windowX = pointInRootFrame.x();
     windowY = pointInRootFrame.y();
 
-    button = WebMouseEvent::ButtonLeft;
+    button = WebMouseEvent::Button::Left;
     modifiers |= WebInputEvent::LeftButtonDown;
     clickCount = (type == MouseDown || type == MouseUp);
 
     IntPoint localPoint = convertAbsoluteLocationForLayoutObject(touch->absoluteLocation(), layoutItem);
     x = localPoint.x();
     y = localPoint.y();
 
     pointerType = WebPointerProperties::PointerType::Touch;
 }
 
@@ skipping 191 matching lines @@
         break;
     case GestureSourceTouchscreen:
         sourceDevice = WebGestureDeviceTouchscreen;
         break;
     case GestureSourceUninitialized:
         NOTREACHED();
     }
 }
 
 } // namespace blink