Refactoring button field and its type

third_party/WebKit/Source/core/events/PointerEventFactory.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/events/PointerEventFactory.h"
 
 #include "core/frame/FrameView.h"
 #include "platform/geometry/FloatSize.h"
 
 namespace blink {
@@ skipping 33 matching lines @@
     RETURN_CORRESPONDING_PE_NAME(out);
     RETURN_CORRESPONDING_PE_NAME(over);
     RETURN_CORRESPONDING_PE_NAME(up);
 
 #undef RETURN_CORRESPONDING_PE_NAME
 
     NOTREACHED();
     return emptyAtom;
 }
 
+
+unsigned short buttonToButtons(WebPointerProperties::Button button)

[bokan, 2016/08/12 16:25:16]

There's got to be a better name for this...:P

Perhaps buttonToButtonsBitfield?

[Navid Zolghadr, 2016/08/12 17:14:37]

Sure :)

+{
+    switch (button) {
+    case WebPointerProperties::Button::NoButton:
+        return static_cast<unsigned short>(MouseEvent::Buttons::None);
+    case WebPointerProperties::Button::Left:
+        return static_cast<unsigned short>(MouseEvent::Buttons::Left);
+    case WebPointerProperties::Button::Right:
+        return static_cast<unsigned short>(MouseEvent::Buttons::Right);
+    case WebPointerProperties::Button::Middle:
+        return static_cast<unsigned short>(MouseEvent::Buttons::Middle);
+    }
+    NOTREACHED();
+    return 0;
+}
+
 } // namespace
 
 const int PointerEventFactory::s_invalidId = 0;
 
 // Mouse id is 1 to behave the same as MS Edge for compatibility reasons.
 const int PointerEventFactory::s_mouseId = 1;
 
 float getPointerEventPressure(float force, int buttons)
 {
     if (std::isnan(force))
@@ skipping 20 matching lines @@
     pointerEventInit.setBubbles(type != EventTypeNames::pointerenter
         && type != EventTypeNames::pointerleave);
     pointerEventInit.setCancelable(type != EventTypeNames::pointerenter
         && type != EventTypeNames::pointerleave
         && type != EventTypeNames::pointercancel
         && type != EventTypeNames::gotpointercapture
         && type != EventTypeNames::lostpointercapture);
 }
 
 PointerEvent* PointerEventFactory::create(
-    const AtomicString& mouseEventName, const PlatformMouseEvent& mouseEvent,
-    EventTarget* relatedTarget,
+    const AtomicString& mouseEventName,
+    const PlatformMouseEvent& mouseEvent,
     LocalDOMWindow* view)
 {
     DCHECK(mouseEventName == EventTypeNames::mousemove
         || mouseEventName == EventTypeNames::mousedown
         || mouseEventName == EventTypeNames::mouseup);
 
     AtomicString pointerEventName = pointerEventNameForMouseEventName(mouseEventName);
     unsigned buttons = MouseEvent::platformModifiersToButtons(mouseEvent.getModifiers());
     PointerEventInit pointerEventInit;
 
@@ skipping 12 matching lines @@
         float scaleFactor = 1 / frame->pageZoomFactor();
         locationInFrameZoomed.scale(scaleFactor, scaleFactor);
     }
 
     // Set up initial values for coordinates.
     pointerEventInit.setClientX(locationInFrameZoomed.x());
     pointerEventInit.setClientY(locationInFrameZoomed.y());
 
     if (pointerEventName == EventTypeNames::pointerdown
         || pointerEventName == EventTypeNames::pointerup) {
-        pointerEventInit.setButton(mouseEvent.button());
+        pointerEventInit.setButton(static_cast<int>(mouseEvent.pointerProperties().button));
     } else { // Only when pointerEventName == EventTypeNames::pointermove

[bokan, 2016/08/12 16:25:16]

Perhaps turn this comment into a DCHECK?

[Navid Zolghadr, 2016/08/12 17:14:37]

Done.

-        pointerEventInit.setButton(NoButton);
+        pointerEventInit.setButton(static_cast<int>(WebPointerProperties::Button::NoButton));
     }
     pointerEventInit.setPressure(getPointerEventPressure(
         mouseEvent.pointerProperties().force, pointerEventInit.buttons()));
     pointerEventInit.setTiltX(mouseEvent.pointerProperties().tiltX);
     pointerEventInit.setTiltY(mouseEvent.pointerProperties().tiltY);
 
     UIEventWithKeyState::setFromPlatformModifiers(pointerEventInit, mouseEvent.getModifiers());
 
     // Make sure chorded buttons fire pointermove instead of pointerup/down.
     if ((pointerEventName == EventTypeNames::pointerdown
-        && (buttons & ~MouseEvent::buttonToButtons(mouseEvent.button())) != 0)
+        && (buttons & ~buttonToButtons(mouseEvent.pointerProperties().button)) != 0)
         || (pointerEventName == EventTypeNames::pointerup && buttons != 0))
         pointerEventName = EventTypeNames::pointermove;
 
 
     pointerEventInit.setView(view);
-    if (relatedTarget)
-        pointerEventInit.setRelatedTarget(relatedTarget);

[bokan, 2016/08/12 16:25:16]

Why is this no longer needed? Please elaborate in the CL description.

[Navid Zolghadr, 2016/08/12 17:14:37]

The related target for all pointerevents (similar to mouseevent) should be null
except for boundary events. So relatedTarget can be removed from some of the
functions as they don't generate boundary events.
I added this to the description as well.

 
     return PointerEvent::create(pointerEventName, pointerEventInit);
 }
 
 PointerEvent* PointerEventFactory::create(const AtomicString& type,
     const PlatformTouchPoint& touchPoint, PlatformEvent::Modifiers modifiers,
     const FloatSize& pointRadius,
     const FloatPoint& clientPoint,
     DOMWindow* view)
 {
@@ skipping 12 matching lines @@
 
     setIdTypeButtons(pointerEventInit, touchPoint.pointerProperties(),
         pointerReleasedOrCancelled ? 0 : 1);
 
     pointerEventInit.setWidth(pointRadius.width());
     pointerEventInit.setHeight(pointRadius.height());
     pointerEventInit.setScreenX(touchPoint.screenPos().x());
     pointerEventInit.setScreenY(touchPoint.screenPos().y());
     pointerEventInit.setClientX(clientPoint.x());
     pointerEventInit.setClientY(clientPoint.y());
-    pointerEventInit.setButton(pointerPressedOrReleased ? LeftButton: NoButton);
+    pointerEventInit.setButton(static_cast<int>(pointerPressedOrReleased ? WebPointerProperties::Button::Left : WebPointerProperties::Button::NoButton));
     pointerEventInit.setPressure(getPointerEventPressure(
         touchPoint.force(), pointerEventInit.buttons()));
     pointerEventInit.setTiltX(touchPoint.pointerProperties().tiltX);
     pointerEventInit.setTiltY(touchPoint.pointerProperties().tiltY);
     pointerEventInit.setView(view);
 
     UIEventWithKeyState::setFromPlatformModifiers(pointerEventInit, modifiers);
 
     pointerEventInit.setBubbles(!isEnterOrLeave);
     pointerEventInit.setCancelable(!isEnterOrLeave && pointState != PlatformTouchPoint::TouchCancelled);
@@ skipping 186 matching lines @@
     if (properties.pointerType
         == WebPointerProperties::PointerType::Mouse)
         return PointerEventFactory::s_mouseId;
     IncomingId id(properties.pointerType, properties.id);
     if (m_pointerIncomingIdMapping.contains(id))
         return m_pointerIncomingIdMapping.get(id);
     return PointerEventFactory::s_invalidId;
 }
 
 } // namespace blink