| 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 85a2341336f5644cfc8e5999c6244106d20a5cf7..b2b2af8959d69628c246cf52c87d61aeb2ff4b84 100644
|
| --- a/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
|
| @@ -149,7 +149,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
|
| touchList->append(touch0);
|
| TouchEvent* touchEvent = TouchEvent::create(
|
| touchList, touchList, touchList, EventTypeNames::touchstart, domWindow,
|
| - PlatformEvent::NoModifiers, false, false, true, 0);
|
| + PlatformEvent::NoModifiers, false, false, true, 0, TouchActionAuto);
|
|
|
| WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
|
| ASSERT_EQ(1u, webTouchBuilder.touchesLength);
|
| @@ -174,7 +174,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
|
| touchList->append(touch0);
|
| TouchEvent* touchEvent = TouchEvent::create(
|
| touchList, touchList, touchList, EventTypeNames::touchstart, domWindow,
|
| - PlatformEvent::NoModifiers, true, false, true, 0);
|
| + PlatformEvent::NoModifiers, true, false, true, 0, TouchActionAuto);
|
|
|
| WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
|
| EXPECT_EQ(WebInputEvent::Blocking, webTouchBuilder.dispatchType);
|
| @@ -187,10 +187,10 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
|
| 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);
|
| + TouchEvent* touchEvent = TouchEvent::create(
|
| + activeTouchList, activeTouchList, movedTouchList,
|
| + EventTypeNames::touchmove, domWindow, PlatformEvent::NoModifiers, false,
|
| + false, true, 0, TouchActionAuto);
|
|
|
| WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
|
| ASSERT_EQ(2u, webTouchBuilder.touchesLength);
|
| @@ -209,10 +209,10 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
|
| 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);
|
| + TouchEvent* touchEvent = TouchEvent::create(
|
| + activeTouchList, activeTouchList, movedTouchList,
|
| + EventTypeNames::touchmove, domWindow, PlatformEvent::NoModifiers, false,
|
| + false, true, 0, TouchActionAuto);
|
|
|
| WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
|
| ASSERT_EQ(2u, webTouchBuilder.touchesLength);
|
| @@ -230,10 +230,10 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
|
| 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);
|
| + TouchEvent* touchEvent = TouchEvent::create(
|
| + activeTouchList, activeTouchList, releasedTouchList,
|
| + EventTypeNames::touchend, domWindow, PlatformEvent::NoModifiers, false,
|
| + false, false, 0, TouchActionAuto);
|
|
|
| WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
|
| ASSERT_EQ(2u, webTouchBuilder.touchesLength);
|
| @@ -251,10 +251,10 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
|
| 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);
|
| + TouchEvent* touchEvent = TouchEvent::create(
|
| + activeTouchList, activeTouchList, cancelledTouchList,
|
| + EventTypeNames::touchcancel, domWindow, PlatformEvent::NoModifiers,
|
| + false, false, false, 0, TouchActionAuto);
|
|
|
| WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
|
| ASSERT_EQ(2u, webTouchBuilder.touchesLength);
|
| @@ -281,7 +281,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
|
| }
|
| TouchEvent* touchEvent = TouchEvent::create(
|
| touchList, touchList, touchList, EventTypeNames::touchstart, domWindow,
|
| - PlatformEvent::NoModifiers, false, false, true, 0);
|
| + PlatformEvent::NoModifiers, false, false, true, 0, TouchActionAuto);
|
|
|
| WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
|
| ASSERT_EQ(static_cast<unsigned>(WebTouchEvent::kTouchesLengthCap),
|
| @@ -559,7 +559,7 @@ TEST(WebInputEventConversionTest, InputEventsScaling) {
|
| touchList->append(touch);
|
| TouchEvent* touchEvent = TouchEvent::create(
|
| touchList, touchList, touchList, EventTypeNames::touchmove, domWindow,
|
| - PlatformEvent::NoModifiers, false, false, true, 0);
|
| + PlatformEvent::NoModifiers, false, false, true, 0, TouchActionAuto);
|
|
|
| WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
|
| ASSERT_EQ(1u, webTouchBuilder.touchesLength);
|
|
|