Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp |
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp |
index 575676031f3e38dae4b38e7c5a93e4d394b832db..b3166c72194405d1f64d1daeb1fa8e567af57743 100644 |
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp |
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp |
@@ -1600,7 +1600,7 @@ TEST_F(WebFrameTest, SetForceZeroLayoutHeightWorksWithRelayoutsWhenHeightChanged |
ASSERT_NE(nullptr, element); |
EXPECT_EQ(String("oldValue"), element->innerText()); |
- PlatformGestureEvent gestureEvent(PlatformEvent::Type::GestureTap, hitPoint, hitPoint, IntSize(0, 0), 0, PlatformEvent::NoModifiers); |
+ PlatformGestureEvent gestureEvent(PlatformEvent::Type::GestureTap, hitPoint, hitPoint, IntSize(0, 0), 0, PlatformEvent::NoModifiers, PlatformGestureSourceTouchscreen); |
webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().handleGestureEvent(gestureEvent); |
// when pressed, the button changes its own text to "updatedValue" |
EXPECT_EQ(String("updatedValue"), element->innerText()); |
@@ -4758,6 +4758,7 @@ static WebGestureEvent fatTap(int x, int y) |
{ |
WebGestureEvent event; |
event.type = WebInputEvent::GestureTap; |
+ event.sourceDevice = WebGestureDeviceTouchscreen; |
event.x = x; |
event.y = y; |
event.data.tap.width = 50; |
@@ -7991,6 +7992,9 @@ protected: |
{ |
WebGestureEvent event; |
event.type = type; |
+ // TODO(wjmaclean): Make sure that touchpad device is only ever used for |
+ // gesture scrolling event types. |
+ event.sourceDevice = WebGestureDeviceTouchpad; |
event.x = 100; |
event.y = 100; |
if (type == WebInputEvent::GestureScrollUpdate) { |