Extract touch handling logic from EventHandler

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 "platform/geometry/FloatSize.h"
+
 namespace blink {
 
 namespace {
 
 inline int toInt(WebPointerProperties::PointerType t) { return static_cast<int>(t); }
 
 const char* pointerTypeNameForWebPointPointerType(WebPointerProperties::PointerType type)
 {
     switch (type) {
     case WebPointerProperties::PointerType::Unknown:
@@ skipping 106 matching lines @@
 
     pointerEventInit.setView(view);
     if (relatedTarget)
         pointerEventInit.setRelatedTarget(relatedTarget);
 
     return PointerEvent::create(pointerEventName, pointerEventInit);
 }
 
 PointerEvent* PointerEventFactory::create(const AtomicString& type,
     const PlatformTouchPoint& touchPoint, PlatformEvent::Modifiers modifiers,
-    const double width, const double height,
-    const double clientX, const double clientY)
+    const FloatSize& pointRadius,
+    const FloatPoint& pagePoint)
 {
     const PlatformTouchPoint::TouchState pointState = touchPoint.state();
 
     bool pointerReleasedOrCancelled =
         pointState == PlatformTouchPoint::TouchReleased
         || pointState == PlatformTouchPoint::TouchCancelled;
     bool pointerPressedOrReleased =
         pointState == PlatformTouchPoint::TouchPressed
         || pointState == PlatformTouchPoint::TouchReleased;
 
     bool isEnterOrLeave = false;
 
     PointerEventInit pointerEventInit;
 
     setIdTypeButtons(pointerEventInit, touchPoint.pointerProperties(),
         pointerReleasedOrCancelled ? 0 : 1);
 
-    pointerEventInit.setWidth(width);
-    pointerEventInit.setHeight(height);
+    pointerEventInit.setWidth(pointRadius.width());
+    pointerEventInit.setHeight(pointRadius.height());
     pointerEventInit.setTiltX(touchPoint.pointerProperties().tiltX);
     pointerEventInit.setTiltY(touchPoint.pointerProperties().tiltY);
     pointerEventInit.setScreenX(touchPoint.screenPos().x());
     pointerEventInit.setScreenY(touchPoint.screenPos().y());
-    pointerEventInit.setClientX(clientX);
-    pointerEventInit.setClientY(clientY);
+    pointerEventInit.setClientX(pagePoint.x());
+    pointerEventInit.setClientY(pagePoint.y());
     pointerEventInit.setButton(pointerPressedOrReleased ? LeftButton: NoButton);
     pointerEventInit.setPressure(getPointerEventPressure(
         touchPoint.force(), pointerEventInit.buttons()));
 
     UIEventWithKeyState::setFromPlatformModifiers(pointerEventInit, modifiers);
 
     pointerEventInit.setBubbles(!isEnterOrLeave);
     pointerEventInit.setCancelable(!isEnterOrLeave && pointState != PlatformTouchPoint::TouchCancelled);
 
     return PointerEvent::create(type, pointerEventInit);
@@ skipping 177 matching lines @@
 {
     return m_pointerIdMapping.contains(pointerId);
 }
 
 bool PointerEventFactory::isActiveButtonsState(const int pointerId)
 {
     return m_pointerIdMapping.contains(pointerId)
         && m_pointerIdMapping.get(pointerId).isActiveButtons;
 }
 
+int PointerEventFactory::getPointerEventId(
+    const WebPointerProperties& properties)
+{
+    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