Fix missing fields in GestureScrollBegin/Update/End event conversions.

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

Index: third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp b/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
index b852d84fe5b4db1fdde406af0d53e5f9c5b95bb5..f2a4c5e88589f56042bd1d9a94a60f73ba10c04d 100644
--- a/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
@@ -993,4 +993,70 @@ TEST(WebInputEventConversionTest, PlatformWheelEventBuilder)
     }
 }
 
+TEST(WebInputEventConversionTest, PlatformGestureEventBuilder)
+{
+    const std::string baseURL("http://www.test8.com/");
+    const std::string fileName("fixed_layout.html");
+
+    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("fixed_layout.html"));
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(baseURL + fileName, true);
+    int pageWidth = 640;
+    int pageHeight = 480;
+    webViewImpl->resize(WebSize(pageWidth, pageHeight));
+    webViewImpl->updateAllLifecyclePhases();
+
+    FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
+
+    {
+        WebGestureEvent webGestureEvent;
+        webGestureEvent.type = WebInputEvent::GestureScrollBegin;
+        webGestureEvent.x = 0;
+        webGestureEvent.y = 5;
+        webGestureEvent.globalX = 10;
+        webGestureEvent.globalY = 15;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
+        webGestureEvent.resendingPluginId = 2;

[tdresser, 2016/03/23 16:58:47]

Looks like you're missing an expectation for resendingPluginId (and below).

[dtapuska, 2016/03/23 17:25:30]

Done.

+        webGestureEvent.data.scrollBegin.inertial = true;
+        webGestureEvent.data.scrollBegin.synthetic = true;
+        webGestureEvent.data.scrollBegin.deltaXHint = 100;
+        webGestureEvent.data.scrollBegin.deltaYHint = 10;
+        webGestureEvent.data.scrollBegin.deltaHintUnits = WebGestureEvent::Pixels;
+
+        PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
+        EXPECT_EQ(0, platformGestureBuilder.position().x());
+        EXPECT_EQ(5, platformGestureBuilder.position().y());
+        EXPECT_EQ(10, platformGestureBuilder.globalPosition().x());
+        EXPECT_EQ(15, platformGestureBuilder.globalPosition().y());
+        EXPECT_TRUE(platformGestureBuilder.inertial());
+        EXPECT_TRUE(platformGestureBuilder.synthetic());
+        EXPECT_EQ(100, platformGestureBuilder.deltaX());
+        EXPECT_EQ(10, platformGestureBuilder.deltaY());
+        EXPECT_EQ(ScrollGranularity::ScrollByPixel, platformGestureBuilder.deltaUnits());
+    }
+
+    {
+        WebGestureEvent webGestureEvent;
+        webGestureEvent.type = WebInputEvent::GestureScrollEnd;
+        webGestureEvent.x = 0;
+        webGestureEvent.y = 5;
+        webGestureEvent.globalX = 10;
+        webGestureEvent.globalY = 15;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
+        webGestureEvent.resendingPluginId = 2;
+        webGestureEvent.data.scrollEnd.inertial = false;
+        webGestureEvent.data.scrollEnd.synthetic = true;
+        webGestureEvent.data.scrollEnd.deltaUnits = WebGestureEvent::Page;
+
+        PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
+        EXPECT_EQ(0, platformGestureBuilder.position().x());
+        EXPECT_EQ(5, platformGestureBuilder.position().y());
+        EXPECT_EQ(10, platformGestureBuilder.globalPosition().x());
+        EXPECT_EQ(15, platformGestureBuilder.globalPosition().y());
+        EXPECT_FALSE(platformGestureBuilder.inertial());
+        EXPECT_TRUE(platformGestureBuilder.synthetic());
+        EXPECT_EQ(ScrollGranularity::ScrollByPage, platformGestureBuilder.deltaUnits());
+    }
+}
+
 } // namespace blink