Articulate the cancel behavior in the WebTouchEvent.

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 121 matching lines @@
         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(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, 0);
+
+        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, 0);
 
         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, 0);
 
         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, 0);
 
         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, 0);
 
         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::touchesLengthCap) * 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);
@@ skipping 248 matching lines @@
         TouchEvent* touchEvent = TouchEvent::create(touchList, touchList, touchList, EventTypeNames::touchmove, domWindow, PlatformEvent::NoModifiers, false, false, 0);
 
         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_FALSE(webTouchBuilder.cancelable);
+        EXPECT_EQ(WebInputEvent::EventNonBlocking, webTouchBuilder.dispatchType);
     }
 }
 
 TEST(WebInputEventConversionTest, InputEventsTransform)
 {
     const std::string baseURL("http://www.test2.com/");
     const std::string fileName("fixed_layout.html");
 
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("fixed_layout.html"));
     FrameTestHelpers::WebViewHelper webViewHelper;
@@ skipping 566 matching lines @@
         EXPECT_EQ(5, platformGestureBuilder.position().y());
         EXPECT_EQ(10, platformGestureBuilder.globalPosition().x());
         EXPECT_EQ(15, platformGestureBuilder.globalPosition().y());
         EXPECT_FALSE(platformGestureBuilder.inertial());
         EXPECT_TRUE(platformGestureBuilder.synthetic());
         EXPECT_EQ(ScrollGranularity::ScrollByPage, platformGestureBuilder.deltaUnits());
     }
 }
 
 } // namespace blink