Fix movementX/Y attributes for touch pointer events

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 100 matching lines @@
     FloatPoint pagePoint =
         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());
 
+    if (touchPoint.state == WebTouchPoint::StateMoved) {
+      pointerEventInit->setMovementX(touchPoint.movementX);
+      pointerEventInit->setMovementY(touchPoint.movementY);
+    }
+
     FloatSize pointRadius =
         FloatSize(touchPoint.radiusX, touchPoint.radiusY).scaledBy(scaleFactor);
     pointerEventInit->setWidth(pointRadius.width());
     pointerEventInit->setHeight(pointRadius.height());
   }
 
   pointerEventInit->setScreenX(touchPoint.screenPosition.x);
   pointerEventInit->setScreenY(touchPoint.screenPosition.y);
   pointerEventInit->setPressure(
       getPointerEventPressure(touchPoint.force, pointerEventInit->buttons()));
@@ skipping 26 matching lines @@
 
   pointerEventInit->setClientX(locationInFrameZoomed.x());
   pointerEventInit->setClientY(locationInFrameZoomed.y());
 
   pointerEventInit->setPressure(
       getPointerEventPressure(mouseEvent.force, pointerEventInit->buttons()));
   pointerEventInit->setTiltX(mouseEvent.tiltX);
   pointerEventInit->setTiltY(mouseEvent.tiltY);
   pointerEventInit->setTangentialPressure(mouseEvent.tangentialPressure);
   pointerEventInit->setTwist(mouseEvent.twist);
+
+  IntPoint movement = flooredIntPoint(mouseEvent.movementInRootFrame());
+  pointerEventInit->setMovementX(movement.x());
+  pointerEventInit->setMovementY(movement.y());
 }
 
 }  // 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;
 
 void PointerEventFactory::setIdTypeButtons(
@@ skipping 340 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