Plumb gesture source value through Blink.

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 3b9a157531d89d8781c190da6fc1e8fe4b6a8c6b..f508a993027fc5bb307234fc67345cde711ed6b4 100644
--- a/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
@@ -273,6 +273,7 @@ TEST(WebInputEventConversionTest, InputEventsScaling)
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureScrollUpdate;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;

[tdresser, 2015/10/19 12:52:39]

Let's use touchscreen throughout.

[wjmaclean, 2015/10/19 15:26:55]

Done.

         webGestureEvent.x = 10;
         webGestureEvent.y = 12;
         webGestureEvent.globalX = 20;
@@ -302,6 +303,7 @@ TEST(WebInputEventConversionTest, InputEventsScaling)
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureScrollEnd;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.x = 10;
         webGestureEvent.y = 12;
         webGestureEvent.globalX = 20;
@@ -318,6 +320,7 @@ TEST(WebInputEventConversionTest, InputEventsScaling)
     {
         WebGestureEvent webGestureEvent;

[tdresser, 2015/10/19 12:52:39]

If you're feeling industrious, I think a helper method for constructing these
events would make this test a lot easier to read.

[wjmaclean, 2015/10/19 15:26:55]

I'm good with that idea, but I suspect it would benefit from having different
builder methods (e.g. ScrollUpdate has a very different payload than
GestureTap). If we go ahead with it, I'd like to suggest doing it in a separate
CL :-)

         webGestureEvent.type = WebInputEvent::GestureTap;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.tap.width = 10;
         webGestureEvent.data.tap.height = 10;
 
@@ -329,6 +332,7 @@ TEST(WebInputEventConversionTest, InputEventsScaling)
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTapUnconfirmed;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.tap.width = 10;
         webGestureEvent.data.tap.height = 10;
 
@@ -340,6 +344,7 @@ TEST(WebInputEventConversionTest, InputEventsScaling)
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTapDown;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.tapDown.width = 10;
         webGestureEvent.data.tapDown.height = 10;
 
@@ -351,6 +356,7 @@ TEST(WebInputEventConversionTest, InputEventsScaling)
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureShowPress;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.showPress.width = 10;
         webGestureEvent.data.showPress.height = 10;
 
@@ -362,6 +368,7 @@ TEST(WebInputEventConversionTest, InputEventsScaling)
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureLongPress;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.longPress.width = 10;
         webGestureEvent.data.longPress.height = 10;
 
@@ -373,6 +380,7 @@ TEST(WebInputEventConversionTest, InputEventsScaling)
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTwoFingerTap;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.twoFingerTap.firstFingerWidth = 10;
         webGestureEvent.data.twoFingerTap.firstFingerHeight = 10;
 
@@ -433,7 +441,7 @@ TEST(WebInputEventConversionTest, InputEventsScaling)
 
     {
         PlatformGestureEvent platformGestureEvent(PlatformEvent::GestureScrollUpdate, IntPoint(10, 12), IntPoint(20, 22), IntSize(25, 27), 0,
-            PlatformEvent::NoModifiers);
+            PlatformEvent::NoModifiers, PlatformGestureSourceTouchscreen);
         platformGestureEvent.setScrollGestureData(30, 32, 40, 42, true, true, -1 /* null plugin id */);
         // FIXME: GestureEvent does not preserve velocityX, velocityY,
         // or preventPropagation. It also fails to scale
@@ -453,6 +461,7 @@ TEST(WebInputEventConversionTest, InputEventsScaling)
         EXPECT_EQ(0, webGestureBuilder.data.scrollUpdate.velocityY);
         EXPECT_TRUE(webGestureBuilder.data.scrollUpdate.inertial);
         EXPECT_FALSE(webGestureBuilder.data.scrollUpdate.preventPropagation);
+        EXPECT_EQ(WebGestureDeviceTouchscreen,  webGestureBuilder.sourceDevice);
     }
 
     {
@@ -516,6 +525,7 @@ TEST(WebInputEventConversionTest, InputEventsTransform)
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureScrollUpdate;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.x = 100;
         webGestureEvent.y = 110;
         webGestureEvent.globalX = 100;
@@ -535,6 +545,7 @@ TEST(WebInputEventConversionTest, InputEventsTransform)
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTap;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.tap.width = 30;
         webGestureEvent.data.tap.height = 30;
 
@@ -546,6 +557,7 @@ TEST(WebInputEventConversionTest, InputEventsTransform)
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTapUnconfirmed;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.tap.width = 30;
         webGestureEvent.data.tap.height = 30;
 
@@ -557,6 +569,7 @@ TEST(WebInputEventConversionTest, InputEventsTransform)
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTapDown;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.tapDown.width = 30;
         webGestureEvent.data.tapDown.height = 30;
 
@@ -568,6 +581,7 @@ TEST(WebInputEventConversionTest, InputEventsTransform)
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureShowPress;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.showPress.width = 30;
         webGestureEvent.data.showPress.height = 30;
 
@@ -579,6 +593,7 @@ TEST(WebInputEventConversionTest, InputEventsTransform)
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureLongPress;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.longPress.width = 30;
         webGestureEvent.data.longPress.height = 30;
 
@@ -590,6 +605,7 @@ TEST(WebInputEventConversionTest, InputEventsTransform)
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTwoFingerTap;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.twoFingerTap.firstFingerWidth = 30;
         webGestureEvent.data.twoFingerTap.firstFingerHeight = 30;
 
@@ -641,6 +657,7 @@ TEST(WebInputEventConversionTest, InputEventsConversions)
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTap;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.x = 10;
         webGestureEvent.y = 10;
         webGestureEvent.globalX = 10;
@@ -724,6 +741,7 @@ TEST(WebInputEventConversionTest, VisualViewportOffset)
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureScrollUpdate;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.x = 10;
         webGestureEvent.y = 10;
         webGestureEvent.globalX = 10;