Remove PlatformTouchEvent/Point and use WebTouchEvent/Point instead

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 58 matching lines @@
     CASE_BUTTON_TO_BUTTONS(Eraser);
   }
 
 #undef CASE_BUTTON_TO_BUTTONS
 
   NOTREACHED();
   return 0;
 }
 
 const AtomicString& pointerEventNameForTouchPointState(
-    PlatformTouchPoint::TouchState state) {
+    WebTouchPoint::State state) {
   switch (state) {
-    case PlatformTouchPoint::TouchReleased:
+    case WebTouchPoint::StateReleased:
       return EventTypeNames::pointerup;
-    case PlatformTouchPoint::TouchCancelled:
+    case WebTouchPoint::StateCancelled:
       return EventTypeNames::pointercancel;
-    case PlatformTouchPoint::TouchPressed:
+    case WebTouchPoint::StatePressed:
       return EventTypeNames::pointerdown;
-    case PlatformTouchPoint::TouchMoved:
+    case WebTouchPoint::StateMoved:
       return EventTypeNames::pointermove;
-    case PlatformTouchPoint::TouchStationary:
+    case WebTouchPoint::StateStationary:
     // Fall through to default
     default:
       NOTREACHED();
       return emptyAtom;
   }
 }
 
 float getPointerEventPressure(float force, int buttons) {
   if (std::isnan(force))
     return buttons ? 0.5 : 0;
   return force;
 }
 
-void updateTouchPointerEventInit(const PlatformTouchPoint& touchPoint,
+void updateTouchPointerEventInit(const WebTouchPoint& touchPoint,
                                  LocalFrame* targetFrame,
                                  PointerEventInit* pointerEventInit) {
   // This function should not update attributes like pointerId, isPrimary,
   // and pointerType which is the same among the coalesced events and the
   // dispatched event.
 
   if (targetFrame) {
     FloatPoint pagePoint =
-        targetFrame->view()->rootFrameToContents(touchPoint.pos());
+        targetFrame->view()->rootFrameToContents(touchPoint.position);
     float scaleFactor = 1.0f / targetFrame->pageZoomFactor();
     FloatPoint scrollPosition(targetFrame->view()->getScrollOffset());
     FloatPoint clientPoint = pagePoint.scaledBy(scaleFactor);
     clientPoint.moveBy(scrollPosition.scaledBy(-scaleFactor));
 
     pointerEventInit->setClientX(clientPoint.x());
     pointerEventInit->setClientY(clientPoint.y());
 
-    FloatSize pointRadius = touchPoint.radius().scaledBy(scaleFactor);
+    FloatSize pointRadius =
+        FloatSize(touchPoint.radiusX, touchPoint.radiusY).scaledBy(scaleFactor);
     pointerEventInit->setWidth(pointRadius.width());
     pointerEventInit->setHeight(pointRadius.height());
   }
 
-  pointerEventInit->setScreenX(touchPoint.screenPos().x());
-  pointerEventInit->setScreenY(touchPoint.screenPos().y());
+  pointerEventInit->setScreenX(touchPoint.screenPosition.x);
+  pointerEventInit->setScreenY(touchPoint.screenPosition.y);
   pointerEventInit->setPressure(
-      getPointerEventPressure(touchPoint.force(), pointerEventInit->buttons()));
-  pointerEventInit->setTiltX(touchPoint.pointerProperties().tiltX);
-  pointerEventInit->setTiltY(touchPoint.pointerProperties().tiltY);
-  pointerEventInit->setTangentialPressure(
-      touchPoint.pointerProperties().tangentialPressure);
-  pointerEventInit->setTwist(touchPoint.pointerProperties().twist);
+      getPointerEventPressure(touchPoint.force, pointerEventInit->buttons()));
+  pointerEventInit->setTiltX(touchPoint.tiltX);
+  pointerEventInit->setTiltY(touchPoint.tiltY);
+  pointerEventInit->setTangentialPressure(touchPoint.tangentialPressure);
+  pointerEventInit->setTwist(touchPoint.twist);
 }
 
 void updateMousePointerEventInit(const PlatformMouseEvent& mouseEvent,
                                  LocalDOMWindow* view,
                                  PointerEventInit* pointerEventInit) {
   // This function should not update attributes like pointerId, isPrimary,
   // and pointerType which is the same among the coalesced events and the
   // dispatched event.
 
   pointerEventInit->setScreenX(mouseEvent.globalPosition().x());
@@ skipping 132 matching lines @@
       coalescedPointerEvents.push_back(
           PointerEvent::create(pointerEventName, coalescedEventInit));
     }
     pointerEventInit.setCoalescedEvents(coalescedPointerEvents);
   }
 
   return PointerEvent::create(pointerEventName, pointerEventInit);
 }
 
 PointerEvent* PointerEventFactory::create(
-    const PlatformTouchPoint& touchPoint,
-    const Vector<PlatformTouchPoint>& coalescedPoints,
-    PlatformEvent::Modifiers modifiers,
+    const WebTouchPoint& touchPoint,
+    const Vector<WebTouchPoint>& coalescedPoints,
+    WebInputEvent::Modifiers modifiers,
     LocalFrame* targetFrame,
     DOMWindow* view) {
-  const PlatformTouchPoint::TouchState pointState = touchPoint.state();
+  const WebTouchPoint::State pointState = touchPoint.state;
   const AtomicString& type =
-      pointerEventNameForTouchPointState(touchPoint.state());
+      pointerEventNameForTouchPointState(touchPoint.state);
 
   bool pointerReleasedOrCancelled =
-      pointState == PlatformTouchPoint::TouchReleased ||
-      pointState == PlatformTouchPoint::TouchCancelled;
+      pointState == WebTouchPoint::State::StateReleased ||
+      pointState == WebTouchPoint::State::StateCancelled;
   bool pointerPressedOrReleased =
-      pointState == PlatformTouchPoint::TouchPressed ||
-      pointState == PlatformTouchPoint::TouchReleased;
+      pointState == WebTouchPoint::State::StatePressed ||
+      pointState == WebTouchPoint::State::StateReleased;
 
   PointerEventInit pointerEventInit;
 
-  setIdTypeButtons(pointerEventInit, touchPoint.pointerProperties(),
+  setIdTypeButtons(pointerEventInit, touchPoint,
                    pointerReleasedOrCancelled ? 0 : 1);
   pointerEventInit.setButton(static_cast<int>(
       pointerPressedOrReleased ? WebPointerProperties::Button::Left
                                : WebPointerProperties::Button::NoButton));
 
   pointerEventInit.setView(view);
   updateTouchPointerEventInit(touchPoint, targetFrame, &pointerEventInit);
 
-  UIEventWithKeyState::setFromPlatformModifiers(pointerEventInit, modifiers);
+  UIEventWithKeyState::setFromWebInputEventModifiers(pointerEventInit,
+                                                     modifiers);
 
   setEventSpecificFields(pointerEventInit, type);
 
   if (type == EventTypeNames::pointermove) {
     HeapVector<Member<PointerEvent>> coalescedPointerEvents;
     for (const auto& coalescedTouchPoint : coalescedPoints) {
-      DCHECK_EQ(touchPoint.state(), coalescedTouchPoint.state());
-      DCHECK_EQ(touchPoint.pointerProperties().id,
-                coalescedTouchPoint.pointerProperties().id);
-      DCHECK_EQ(touchPoint.pointerProperties().pointerType,
-                coalescedTouchPoint.pointerProperties().pointerType);
+      DCHECK_EQ(touchPoint.state, coalescedTouchPoint.state);
+      DCHECK_EQ(touchPoint.id, coalescedTouchPoint.id);
+      DCHECK_EQ(touchPoint.pointerType, coalescedTouchPoint.pointerType);
       PointerEventInit coalescedEventInit = pointerEventInit;
       updateTouchPointerEventInit(coalescedTouchPoint, targetFrame,
                                   &coalescedEventInit);
       coalescedPointerEvents.push_back(
           PointerEvent::create(type, coalescedEventInit));
     }
     pointerEventInit.setCoalescedEvents(coalescedPointerEvents);
   }
 
   return PointerEvent::create(type, pointerEventInit);
@@ skipping 185 matching lines @@
     const WebPointerProperties& properties) const {
   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