Fix movementX/Y attributes for touch pointer events

third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp

 /*
  * Copyright (C) 2012 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 300 matching lines @@
                                 WebInputEvent::NoModifiers,
                                 WebInputEvent::TimeStampForTesting);
     webTouchEvent.touchesLength = 1;
     webTouchEvent.touches[0].state = WebTouchPoint::StateMoved;
     webTouchEvent.touches[0].screenPosition.x = 10.6f;
     webTouchEvent.touches[0].screenPosition.y = 10.4f;
     webTouchEvent.touches[0].position.x = 10.6f;
     webTouchEvent.touches[0].position.y = 10.4f;
     webTouchEvent.touches[0].radiusX = 10.6f;
     webTouchEvent.touches[0].radiusY = 10.4f;
+    webTouchEvent.touches[0].movementX = 20;
+    webTouchEvent.touches[0].movementY = 20;
 
     EXPECT_FLOAT_EQ(10.6f, webTouchEvent.touches[0].screenPosition.x);
     EXPECT_FLOAT_EQ(10.4f, webTouchEvent.touches[0].screenPosition.y);
     EXPECT_FLOAT_EQ(10.6f, webTouchEvent.touches[0].position.x);
     EXPECT_FLOAT_EQ(10.4f, webTouchEvent.touches[0].position.y);
     EXPECT_FLOAT_EQ(10.6f, webTouchEvent.touches[0].radiusX);
     EXPECT_FLOAT_EQ(10.4f, webTouchEvent.touches[0].radiusY);
+    EXPECT_EQ(20, webTouchEvent.touches[0].movementX);
+    EXPECT_EQ(20, webTouchEvent.touches[0].movementY);
 
     WebTouchEvent transformedEvent =
         TransformWebTouchEvent(view, webTouchEvent);
     WebTouchPoint transformedPoint = transformedEvent.touchPointInRootFrame(0);
     EXPECT_FLOAT_EQ(10.6f, transformedPoint.screenPosition.x);
     EXPECT_FLOAT_EQ(10.4f, transformedPoint.screenPosition.y);
     EXPECT_FLOAT_EQ(5.3f, transformedPoint.position.x);
     EXPECT_FLOAT_EQ(5.2f, transformedPoint.position.y);
     EXPECT_FLOAT_EQ(5.3f, transformedPoint.radiusX);
     EXPECT_FLOAT_EQ(5.2f, transformedPoint.radiusY);
+    EXPECT_EQ(10, transformedPoint.movementX);
+    EXPECT_EQ(10, transformedPoint.movementY);
   }
 }
 
 TEST(WebInputEventConversionTest, InputEventsTransform) {
   const std::string baseURL("http://www.test2.com/");
   const std::string fileName("fixed_layout.html");
 
   registerMockedURL(baseURL, fileName);
   FrameTestHelpers::WebViewHelper webViewHelper;
   WebViewImpl* webViewImpl =
@@ skipping 532 matching lines @@
         flooredIntPoint(transformedMouseEvent.positionInRootFrame());
 
     EXPECT_EQ(webMouseEvent.x + elasticOverscroll.width(), position.x());
     EXPECT_EQ(webMouseEvent.y + elasticOverscroll.height(), position.y());
     EXPECT_EQ(webMouseEvent.globalX, transformedMouseEvent.globalX);
     EXPECT_EQ(webMouseEvent.globalY, transformedMouseEvent.globalY);
   }
 }
 
 }  // namespace blink