Plumb gesture source value through Blink.

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 255 matching lines @@
         EXPECT_EQ(5, platformMouseBuilder.position().y());
         EXPECT_EQ(10, platformMouseBuilder.globalPosition().x());
         EXPECT_EQ(10, platformMouseBuilder.globalPosition().y());
         EXPECT_EQ(5, platformMouseBuilder.movementDelta().x());
         EXPECT_EQ(5, platformMouseBuilder.movementDelta().y());
     }
 
     {
         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;
         webGestureEvent.globalY = 22;
         webGestureEvent.data.scrollUpdate.deltaX = 30;
         webGestureEvent.data.scrollUpdate.deltaY = 32;
         webGestureEvent.data.scrollUpdate.velocityX = 40;
         webGestureEvent.data.scrollUpdate.velocityY = 42;
         webGestureEvent.data.scrollUpdate.inertial = true;
         webGestureEvent.data.scrollUpdate.preventPropagation = true;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(5, platformGestureBuilder.position().x());
         EXPECT_EQ(6, platformGestureBuilder.position().y());
         EXPECT_EQ(20, platformGestureBuilder.globalPosition().x());
         EXPECT_EQ(22, platformGestureBuilder.globalPosition().y());
         EXPECT_EQ(15, platformGestureBuilder.deltaX());
         EXPECT_EQ(16, platformGestureBuilder.deltaY());
         // TODO: The velocity values may need to be scaled to page scale in
         // order to remain consist with delta values.
         EXPECT_EQ(40, platformGestureBuilder.velocityX());
         EXPECT_EQ(42, platformGestureBuilder.velocityY());
         EXPECT_TRUE(platformGestureBuilder.inertial());
         EXPECT_TRUE(platformGestureBuilder.preventPropagation());
     }
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureScrollEnd;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.x = 10;
         webGestureEvent.y = 12;
         webGestureEvent.globalX = 20;
         webGestureEvent.globalY = 22;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(5, platformGestureBuilder.position().x());
         EXPECT_EQ(6, platformGestureBuilder.position().y());
         EXPECT_EQ(20, platformGestureBuilder.globalPosition().x());
         EXPECT_EQ(22, platformGestureBuilder.globalPosition().y());
         EXPECT_FALSE(platformGestureBuilder.inertial());
     }
 
     {
         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;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(5, platformGestureBuilder.area().width());
         EXPECT_EQ(5, platformGestureBuilder.area().height());
     }
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTapUnconfirmed;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.tap.width = 10;
         webGestureEvent.data.tap.height = 10;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(5, platformGestureBuilder.area().width());
         EXPECT_EQ(5, platformGestureBuilder.area().height());
     }
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTapDown;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.tapDown.width = 10;
         webGestureEvent.data.tapDown.height = 10;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(5, platformGestureBuilder.area().width());
         EXPECT_EQ(5, platformGestureBuilder.area().height());
     }
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureShowPress;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.showPress.width = 10;
         webGestureEvent.data.showPress.height = 10;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(5, platformGestureBuilder.area().width());
         EXPECT_EQ(5, platformGestureBuilder.area().height());
     }
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureLongPress;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.longPress.width = 10;
         webGestureEvent.data.longPress.height = 10;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(5, platformGestureBuilder.area().width());
         EXPECT_EQ(5, platformGestureBuilder.area().height());
     }
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTwoFingerTap;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.twoFingerTap.firstFingerWidth = 10;
         webGestureEvent.data.twoFingerTap.firstFingerHeight = 10;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(5, platformGestureBuilder.area().width());
         EXPECT_EQ(5, platformGestureBuilder.area().height());
     }
 
     {
         WebTouchEvent webTouchEvent;
@@ skipping 40 matching lines @@
 
     {
         PlatformMouseEvent platformMouseEvent(IntPoint(10, 10), IntPoint(10, 10), NoButton, PlatformEvent::MouseMoved, 1, PlatformEvent::NoModifiers, PlatformMouseEvent::RealOrIndistinguishable, 0);
         RefPtrWillBeRawPtr<MouseEvent> mouseEvent = MouseEvent::create(EventTypeNames::mousemove, domWindow, platformMouseEvent, 0, document);
         WebMouseEventBuilder webMouseBuilder(view, documentLayoutView, *mouseEvent);
         EXPECT_EQ(WebMouseEvent::ButtonNone, webMouseBuilder.button);
     }
 
     {
         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
         // coordinates (x, y, deltaX, deltaY) to the page scale. This
         // may lead to unexpected bugs if a PlatformGestureEvent is
         // transformed into WebGestureEvent and back.
         RefPtrWillBeRawPtr<GestureEvent> gestureEvent = GestureEvent::create(domWindow, platformGestureEvent);
         WebGestureEventBuilder webGestureBuilder(documentLayoutView, *gestureEvent);
 
         EXPECT_EQ(10, webGestureBuilder.x);
         EXPECT_EQ(12, webGestureBuilder.y);
         EXPECT_EQ(20, webGestureBuilder.globalX);
         EXPECT_EQ(22, webGestureBuilder.globalY);
         EXPECT_EQ(30, webGestureBuilder.data.scrollUpdate.deltaX);
         EXPECT_EQ(32, webGestureBuilder.data.scrollUpdate.deltaY);
         EXPECT_EQ(0, webGestureBuilder.data.scrollUpdate.velocityX);
         EXPECT_EQ(0, webGestureBuilder.data.scrollUpdate.velocityY);
         EXPECT_TRUE(webGestureBuilder.data.scrollUpdate.inertial);
         EXPECT_FALSE(webGestureBuilder.data.scrollUpdate.preventPropagation);
+        EXPECT_EQ(WebGestureDeviceTouchscreen,  webGestureBuilder.sourceDevice);
     }
 
     {
         RefPtrWillBeRawPtr<Touch> touch = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), 0, FloatPoint(10, 9.5), FloatPoint(3.5, 2), FloatSize(4, 4.5), 0, 0);
         RefPtrWillBeRawPtr<TouchList> touchList = TouchList::create();
         touchList->append(touch);
         RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), EventTypeNames::touchmove, domWindow, PlatformEvent::NoModifiers, false, false);
 
         WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
         ASSERT_EQ(1u, webTouchBuilder.touchesLength);
@@ skipping 43 matching lines @@
         EXPECT_EQ(30, platformMouseBuilder.position().y());
         EXPECT_EQ(100, platformMouseBuilder.globalPosition().x());
         EXPECT_EQ(110, platformMouseBuilder.globalPosition().y());
         EXPECT_EQ(20, platformMouseBuilder.movementDelta().x());
         EXPECT_EQ(20, platformMouseBuilder.movementDelta().y());
     }
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureScrollUpdate;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.x = 100;
         webGestureEvent.y = 110;
         webGestureEvent.globalX = 100;
         webGestureEvent.globalY = 110;
         webGestureEvent.data.scrollUpdate.deltaX = 60;
         webGestureEvent.data.scrollUpdate.deltaY = 60;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(30, platformGestureBuilder.position().x());
         EXPECT_EQ(30, platformGestureBuilder.position().y());
         EXPECT_EQ(100, platformGestureBuilder.globalPosition().x());
         EXPECT_EQ(110, platformGestureBuilder.globalPosition().y());
         EXPECT_EQ(20, platformGestureBuilder.deltaX());
         EXPECT_EQ(20, platformGestureBuilder.deltaY());
     }
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTap;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.tap.width = 30;
         webGestureEvent.data.tap.height = 30;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(10, platformGestureBuilder.area().width());
         EXPECT_EQ(10, platformGestureBuilder.area().height());
     }
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTapUnconfirmed;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.tap.width = 30;
         webGestureEvent.data.tap.height = 30;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(10, platformGestureBuilder.area().width());
         EXPECT_EQ(10, platformGestureBuilder.area().height());
     }
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTapDown;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.tapDown.width = 30;
         webGestureEvent.data.tapDown.height = 30;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(10, platformGestureBuilder.area().width());
         EXPECT_EQ(10, platformGestureBuilder.area().height());
     }
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureShowPress;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.showPress.width = 30;
         webGestureEvent.data.showPress.height = 30;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(10, platformGestureBuilder.area().width());
         EXPECT_EQ(10, platformGestureBuilder.area().height());
     }
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureLongPress;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.longPress.width = 30;
         webGestureEvent.data.longPress.height = 30;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(10, platformGestureBuilder.area().width());
         EXPECT_EQ(10, platformGestureBuilder.area().height());
     }
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTwoFingerTap;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.data.twoFingerTap.firstFingerWidth = 30;
         webGestureEvent.data.twoFingerTap.firstFingerHeight = 30;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(10, platformGestureBuilder.area().width());
         EXPECT_EQ(10, platformGestureBuilder.area().height());
     }
 
     {
         WebTouchEvent webTouchEvent;
@@ skipping 31 matching lines @@
     webViewImpl->layout();
 
     FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
     RefPtrWillBeRawPtr<Document> document = toLocalFrame(webViewImpl->page()->mainFrame())->document();
     LocalDOMWindow* domWindow = document->domWindow();
     LayoutView* documentLayoutView = document->layoutView();
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureTap;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.x = 10;
         webGestureEvent.y = 10;
         webGestureEvent.globalX = 10;
         webGestureEvent.globalY = 10;
         webGestureEvent.data.tap.tapCount = 1;
         webGestureEvent.data.tap.width = 10;
         webGestureEvent.data.tap.height = 10;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(10.f, platformGestureBuilder.position().x());
@@ skipping 63 matching lines @@
         PlatformWheelEventBuilder platformWheelBuilder(view, webMouseWheelEvent);
         EXPECT_EQ(5 + visualOffset.x(), platformWheelBuilder.position().x());
         EXPECT_EQ(5 + visualOffset.y(), platformWheelBuilder.position().y());
         EXPECT_EQ(10, platformWheelBuilder.globalPosition().x());
         EXPECT_EQ(10, platformWheelBuilder.globalPosition().y());
     }
 
     {
         WebGestureEvent webGestureEvent;
         webGestureEvent.type = WebInputEvent::GestureScrollUpdate;
+        webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
         webGestureEvent.x = 10;
         webGestureEvent.y = 10;
         webGestureEvent.globalX = 10;
         webGestureEvent.globalY = 10;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
         EXPECT_EQ(5 + visualOffset.x(), platformGestureBuilder.position().x());
         EXPECT_EQ(5 + visualOffset.y(), platformGestureBuilder.position().y());
         EXPECT_EQ(10, platformGestureBuilder.globalPosition().x());
         EXPECT_EQ(10, platformGestureBuilder.globalPosition().y());
@@ skipping 232 matching lines @@
         EXPECT_EQ(15, platformWheelBuilder.deltaX());
         EXPECT_EQ(10, platformWheelBuilder.deltaY());
         EXPECT_EQ(PlatformEvent::AltKey, platformWheelBuilder.modifiers());
         EXPECT_TRUE(platformWheelBuilder.hasPreciseScrollingDeltas());
         EXPECT_FALSE(platformWheelBuilder.canScroll());
         EXPECT_EQ(platformWheelBuilder.railsMode(), PlatformEvent::RailsModeVertical);
     }
 }
 
 } // namespace blink