| 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 73a7c3ac90d90af459b3b3502463d63fc35ecb05..d1ebc3659e8359009ac6695085c37dbc7ddf6160 100644
|
| --- a/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
|
| @@ -125,7 +125,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder)
|
| {
|
| TouchList* touchList = TouchList::create();
|
| touchList->append(touch0);
|
| - TouchEvent* touchEvent = TouchEvent::create(touchList, touchList, touchList, EventTypeNames::touchstart, domWindow, PlatformEvent::NoModifiers, false, false, 0);
|
| + TouchEvent* touchEvent = TouchEvent::create(touchList, touchList, touchList, EventTypeNames::touchstart, domWindow, PlatformEvent::NoModifiers, false, false, true, 0);
|
|
|
| WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
|
| ASSERT_EQ(1u, webTouchBuilder.touchesLength);
|
| @@ -146,7 +146,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder)
|
| {
|
| TouchList* touchList = TouchList::create();
|
| touchList->append(touch0);
|
| - TouchEvent* touchEvent = TouchEvent::create(touchList, touchList, touchList, EventTypeNames::touchstart, domWindow, PlatformEvent::NoModifiers, true, false, 0);
|
| + TouchEvent* touchEvent = TouchEvent::create(touchList, touchList, touchList, EventTypeNames::touchstart, domWindow, PlatformEvent::NoModifiers, true, false, true, 0);
|
|
|
| WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
|
| EXPECT_EQ(WebInputEvent::Blocking, webTouchBuilder.dispatchType);
|
| @@ -159,7 +159,7 @@ 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, 0);
|
| + TouchEvent* touchEvent = TouchEvent::create(activeTouchList, activeTouchList, movedTouchList, EventTypeNames::touchmove, domWindow, PlatformEvent::NoModifiers, false, false, true, 0);
|
|
|
| WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
|
| ASSERT_EQ(2u, webTouchBuilder.touchesLength);
|
| @@ -178,7 +178,7 @@ 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, 0);
|
| + TouchEvent* touchEvent = TouchEvent::create(activeTouchList, activeTouchList, movedTouchList, EventTypeNames::touchmove, domWindow, PlatformEvent::NoModifiers, false, false, true, 0);
|
|
|
| WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
|
| ASSERT_EQ(2u, webTouchBuilder.touchesLength);
|
| @@ -196,7 +196,7 @@ 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, 0);
|
| + TouchEvent* touchEvent = TouchEvent::create(activeTouchList, activeTouchList, releasedTouchList, EventTypeNames::touchend, domWindow, PlatformEvent::NoModifiers, false, false, false, 0);
|
|
|
| WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
|
| ASSERT_EQ(2u, webTouchBuilder.touchesLength);
|
| @@ -214,7 +214,7 @@ 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, 0);
|
| + TouchEvent* touchEvent = TouchEvent::create(activeTouchList, activeTouchList, cancelledTouchList, EventTypeNames::touchcancel, domWindow, PlatformEvent::NoModifiers, false, false, false, 0);
|
|
|
| WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
|
| ASSERT_EQ(2u, webTouchBuilder.touchesLength);
|
| @@ -235,7 +235,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder)
|
| touchList->append(touch);
|
| changedTouchList->append(touch);
|
| }
|
| - TouchEvent* touchEvent = TouchEvent::create(touchList, touchList, touchList, EventTypeNames::touchstart, domWindow, PlatformEvent::NoModifiers, false, false, 0);
|
| + TouchEvent* touchEvent = TouchEvent::create(touchList, touchList, touchList, EventTypeNames::touchstart, domWindow, PlatformEvent::NoModifiers, false, false, true, 0);
|
|
|
| WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
|
| ASSERT_EQ(static_cast<unsigned>(WebTouchEvent::touchesLengthCap), webTouchBuilder.touchesLength);
|
| @@ -482,7 +482,7 @@ TEST(WebInputEventConversionTest, InputEventsScaling)
|
| 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, 0);
|
| + TouchEvent* touchEvent = TouchEvent::create(touchList, touchList, touchList, EventTypeNames::touchmove, domWindow, PlatformEvent::NoModifiers, false, false, true, 0);
|
|
|
| WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
|
| ASSERT_EQ(1u, webTouchBuilder.touchesLength);
|
|
|