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..7048ea438da34e3a4caca4eaf09b4b2ae4e203d0 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);
 
     WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
     ASSERT_EQ(1u, webTouchBuilder.touchesLength);
@@ -165,6 +166,8 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
     EXPECT_FLOAT_EQ(p0.radiusY, webTouchBuilder.touches[0].radiusY);
     EXPECT_FLOAT_EQ(p0.rotationAngle, webTouchBuilder.touches[0].rotationAngle);
     EXPECT_FLOAT_EQ(p0.force, webTouchBuilder.touches[0].force);
+    EXPECT_EQ(WebPointerProperties::PointerType::Touch,
+              webTouchBuilder.touches[0].pointerType);
     EXPECT_EQ(WebInputEvent::EventNonBlocking, webTouchBuilder.dispatchType);
   }
 
@@ -174,7 +177,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 +194,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 +217,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 +239,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 +261,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 +289,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 +568,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);