Use touch events to report stylus events

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 f32482613ba2a9df639461196c52854fa7f087dd..2d49a50b06a0bcead70d759f26ae0d4676b0306c 100644
--- a/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
@@ -149,7 +149,8 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
     touchList->append(touch0);
     TouchEvent* touchEvent = TouchEvent::create(
         touchList, touchList, touchList, EventTypeNames::touchstart, domWindow,
-        PlatformEvent::NoModifiers, false, false, true, 0, TouchActionAuto);
+        PlatformEvent::NoModifiers, false, false, true, 0, TouchActionAuto,
+        WebPointerProperties::PointerType::Touch);

[Navid Zolghadr, 2016/11/30 16:37:03]

nit: I know it is just a simple getter/setter. But that would be good to just
test for the value of pointerType at least once in these tests.

 
     WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
     ASSERT_EQ(1u, webTouchBuilder.touchesLength);
@@ -174,7 +175,8 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
     touchList->append(touch0);
     TouchEvent* touchEvent = TouchEvent::create(
         touchList, touchList, touchList, EventTypeNames::touchstart, domWindow,
-        PlatformEvent::NoModifiers, true, false, true, 0, TouchActionAuto);
+        PlatformEvent::NoModifiers, true, false, true, 0, TouchActionAuto,
+        WebPointerProperties::PointerType::Touch);
 
     WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
     EXPECT_EQ(WebInputEvent::Blocking, webTouchBuilder.dispatchType);
@@ -190,7 +192,8 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
     TouchEvent* touchEvent = TouchEvent::create(
         activeTouchList, activeTouchList, movedTouchList,
         EventTypeNames::touchmove, domWindow, PlatformEvent::NoModifiers, false,
-        false, true, 0, TouchActionAuto);
+        false, true, 0, TouchActionAuto,
+        WebPointerProperties::PointerType::Touch);
 
     WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
     ASSERT_EQ(2u, webTouchBuilder.touchesLength);
@@ -212,7 +215,8 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
     TouchEvent* touchEvent = TouchEvent::create(
         activeTouchList, activeTouchList, movedTouchList,
         EventTypeNames::touchmove, domWindow, PlatformEvent::NoModifiers, false,
-        false, true, 0, TouchActionAuto);
+        false, true, 0, TouchActionAuto,
+        WebPointerProperties::PointerType::Touch);
 
     WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
     ASSERT_EQ(2u, webTouchBuilder.touchesLength);
@@ -233,7 +237,8 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
     TouchEvent* touchEvent = TouchEvent::create(
         activeTouchList, activeTouchList, releasedTouchList,
         EventTypeNames::touchend, domWindow, PlatformEvent::NoModifiers, false,
-        false, false, 0, TouchActionAuto);
+        false, false, 0, TouchActionAuto,
+        WebPointerProperties::PointerType::Touch);
 
     WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
     ASSERT_EQ(2u, webTouchBuilder.touchesLength);
@@ -254,7 +259,8 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
     TouchEvent* touchEvent = TouchEvent::create(
         activeTouchList, activeTouchList, cancelledTouchList,
         EventTypeNames::touchcancel, domWindow, PlatformEvent::NoModifiers,
-        false, false, false, 0, TouchActionAuto);
+        false, false, false, 0, TouchActionAuto,
+        WebPointerProperties::PointerType::Touch);
 
     WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
     ASSERT_EQ(2u, webTouchBuilder.touchesLength);
@@ -281,7 +287,8 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
     }
     TouchEvent* touchEvent = TouchEvent::create(
         touchList, touchList, touchList, EventTypeNames::touchstart, domWindow,
-        PlatformEvent::NoModifiers, false, false, true, 0, TouchActionAuto);
+        PlatformEvent::NoModifiers, false, false, true, 0, TouchActionAuto,
+        WebPointerProperties::PointerType::Touch);
 
     WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
     ASSERT_EQ(static_cast<unsigned>(WebTouchEvent::kTouchesLengthCap),
@@ -559,7 +566,8 @@ TEST(WebInputEventConversionTest, InputEventsScaling) {
     touchList->append(touch);
     TouchEvent* touchEvent = TouchEvent::create(
         touchList, touchList, touchList, EventTypeNames::touchmove, domWindow,
-        PlatformEvent::NoModifiers, false, false, true, 0, TouchActionAuto);
+        PlatformEvent::NoModifiers, false, false, true, 0, TouchActionAuto,
+        WebPointerProperties::PointerType::Touch);
 
     WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
     ASSERT_EQ(1u, webTouchBuilder.touchesLength);