Use touch events to report stylus events

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 131 matching lines @@
                                 document, p1.id, p1.screenPosition, p1.position,
                                 FloatSize(p1.radiusX, p1.radiusY),
                                 p1.rotationAngle, p1.force, String());
 
   // Test touchstart.
   {
     TouchList* touchList = TouchList::create();
     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);
     EXPECT_EQ(WebInputEvent::TouchStart, webTouchBuilder.type);
     EXPECT_EQ(WebTouchPoint::StatePressed, webTouchBuilder.touches[0].state);
     EXPECT_FLOAT_EQ(p0.screenPosition.x,
                     webTouchBuilder.touches[0].screenPosition.x);
     EXPECT_FLOAT_EQ(p0.screenPosition.y,
                     webTouchBuilder.touches[0].screenPosition.y);
     EXPECT_FLOAT_EQ(p0.position.x, webTouchBuilder.touches[0].position.x);
     EXPECT_FLOAT_EQ(p0.position.y, webTouchBuilder.touches[0].position.y);
     EXPECT_FLOAT_EQ(p0.radiusX, webTouchBuilder.touches[0].radiusX);
     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);
   }
 
   // Test cancelable touchstart.
   {
     TouchList* touchList = TouchList::create();
     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);
   }
 
   // Test touchmove.
   {
     TouchList* activeTouchList = TouchList::create();
     TouchList* movedTouchList = TouchList::create();
     activeTouchList->append(touch0);
     activeTouchList->append(touch1);
     movedTouchList->append(touch0);
     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);
     EXPECT_EQ(WebInputEvent::TouchMove, webTouchBuilder.type);
     EXPECT_EQ(WebTouchPoint::StateMoved, webTouchBuilder.touches[0].state);
     EXPECT_EQ(WebTouchPoint::StateStationary, webTouchBuilder.touches[1].state);
     EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
     EXPECT_EQ(p1.id, webTouchBuilder.touches[1].id);
     EXPECT_EQ(WebInputEvent::EventNonBlocking, webTouchBuilder.dispatchType);
   }
 
   // Test touchmove, different point yields same ordering.
   {
     TouchList* activeTouchList = TouchList::create();
     TouchList* movedTouchList = TouchList::create();
     activeTouchList->append(touch0);
     activeTouchList->append(touch1);
     movedTouchList->append(touch1);
     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);
     EXPECT_EQ(WebInputEvent::TouchMove, webTouchBuilder.type);
     EXPECT_EQ(WebTouchPoint::StateStationary, webTouchBuilder.touches[0].state);
     EXPECT_EQ(WebTouchPoint::StateMoved, webTouchBuilder.touches[1].state);
     EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
     EXPECT_EQ(p1.id, webTouchBuilder.touches[1].id);
     EXPECT_EQ(WebInputEvent::EventNonBlocking, webTouchBuilder.dispatchType);
   }
 
   // Test touchend.
   {
     TouchList* activeTouchList = TouchList::create();
     TouchList* releasedTouchList = TouchList::create();
     activeTouchList->append(touch0);
     releasedTouchList->append(touch1);
     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);
     EXPECT_EQ(WebInputEvent::TouchEnd, webTouchBuilder.type);
     EXPECT_EQ(WebTouchPoint::StateStationary, webTouchBuilder.touches[0].state);
     EXPECT_EQ(WebTouchPoint::StateReleased, webTouchBuilder.touches[1].state);
     EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
     EXPECT_EQ(p1.id, webTouchBuilder.touches[1].id);
     EXPECT_EQ(WebInputEvent::EventNonBlocking, webTouchBuilder.dispatchType);
   }
 
   // Test touchcancel.
   {
     TouchList* activeTouchList = TouchList::create();
     TouchList* cancelledTouchList = TouchList::create();
     cancelledTouchList->append(touch0);
     cancelledTouchList->append(touch1);
     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);
     EXPECT_EQ(WebInputEvent::TouchCancel, webTouchBuilder.type);
     EXPECT_EQ(WebTouchPoint::StateCancelled, webTouchBuilder.touches[0].state);
     EXPECT_EQ(WebTouchPoint::StateCancelled, webTouchBuilder.touches[1].state);
     EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
     EXPECT_EQ(p1.id, webTouchBuilder.touches[1].id);
     EXPECT_EQ(WebInputEvent::EventNonBlocking, webTouchBuilder.dispatchType);
   }
 
   // Test max point limit.
   {
     TouchList* touchList = TouchList::create();
     TouchList* changedTouchList = TouchList::create();
     for (int i = 0; i <= static_cast<int>(WebTouchEvent::kTouchesLengthCap) * 2;
          ++i) {
       Touch* touch = Touch::create(
           toLocalFrame(webViewImpl->page()->mainFrame()), document, i,
           p0.screenPosition, p0.position, FloatSize(p0.radiusX, p0.radiusY),
           p0.rotationAngle, p0.force, String());
       touchList->append(touch);
       changedTouchList->append(touch);
     }
     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),
               webTouchBuilder.touchesLength);
   }
 }
 
 TEST(WebInputEventConversionTest, InputEventsScaling) {
   const std::string baseURL("http://www.test1.com/");
   const std::string fileName("fixed_layout.html");
@@ skipping 257 matching lines @@
 
   {
     Touch* touch =
         Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document,
                       0, FloatPoint(10, 9.5), FloatPoint(3.5, 2),
                       FloatSize(4, 4.5), 0, 0, String());
     TouchList* touchList = TouchList::create();
     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);
     EXPECT_EQ(10, webTouchBuilder.touches[0].screenPosition.x);
     EXPECT_FLOAT_EQ(9.5, webTouchBuilder.touches[0].screenPosition.y);
     EXPECT_FLOAT_EQ(3.5, webTouchBuilder.touches[0].position.x);
     EXPECT_FLOAT_EQ(2, webTouchBuilder.touches[0].position.y);
     EXPECT_FLOAT_EQ(4, webTouchBuilder.touches[0].radiusX);
     EXPECT_FLOAT_EQ(4.5, webTouchBuilder.touches[0].radiusY);
     EXPECT_EQ(WebInputEvent::EventNonBlocking, webTouchBuilder.dispatchType);
@@ skipping 755 matching lines @@
     EXPECT_EQ(ScrollInertialPhaseNonMomentum,
               platformGestureBuilder.inertialPhase());
     EXPECT_TRUE(platformGestureBuilder.synthetic());
     EXPECT_EQ(ScrollGranularity::ScrollByPage,
               platformGestureBuilder.deltaUnits());
     EXPECT_EQ(12345U, platformGestureBuilder.uniqueTouchEventId());
   }
 }
 
 }  // namespace blink