Source/web/tests/WebInputEventConversionTest.cpp - Issue 1148813007: Move EventHandler from core/page/ to core/input

Unified Diff: Source/web/tests/WebInputEventConversionTest.cpp

Issue 1148813007: Move EventHandler from core/page/ to core/input (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: Source/web/tests/WebInputEventConversionTest.cpp

diff --git a/Source/web/tests/WebInputEventConversionTest.cpp b/Source/web/tests/WebInputEventConversionTest.cpp

index 96bffc06e0e9f377f4761e47bf9298748b360223..677ff31950832c421d04c0af29d5d13adb007575 100644

--- a/Source/web/tests/WebInputEventConversionTest.cpp

+++ b/Source/web/tests/WebInputEventConversionTest.cpp

@@ -42,6 +42,7 @@

#include "core/frame/FrameHost.h"

#include "core/frame/FrameView.h"

#include "core/frame/LocalFrame.h"

+#include "core/input/InputDevice.h"

tdresser 2015/06/04 13:08:47 I don't think these changes belong as part of this

#include "core/layout/LayoutView.h"

#include "core/page/Page.h"

#include "platform/testing/URLTestHelpers.h"

@@ -125,11 +126,13 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder)

RefPtrWillBeRawPtr<Touch> touch0 = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), p0.id, p0.screenPosition, p0.position, FloatSize(p0.radiusX, p0.radiusY), p0.rotationAngle, p0.force);

RefPtrWillBeRawPtr<Touch> touch1 = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), p1.id, p1.screenPosition, p1.position, FloatSize(p1.radiusX, p1.radiusY), p1.rotationAngle, p1.force);

+ InputDevice* sourceDeviceFireTouchEvent = InputDevice::touchEventInstance().get();

// Test touchstart.

{

RefPtrWillBeRawPtr<TouchList> touchList = TouchList::create();

touchList->append(touch0);

- RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), EventTypeNames::touchstart, domWindow, false, false, false, false, false, false);

+ RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), EventTypeNames::touchstart, domWindow, sourceDeviceFireTouchEvent, false, false, false, false, false, false);

WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);

ASSERT_EQ(1u, webTouchBuilder.touchesLength);

@@ -152,7 +155,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder)

activeTouchList->append(touch0);

activeTouchList->append(touch1);

movedTouchList->append(touch0);

- RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), movedTouchList.get(), EventTypeNames::touchmove, domWindow, false, false, false, false, false, false);

+ RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), movedTouchList.get(), EventTypeNames::touchmove, domWindow, sourceDeviceFireTouchEvent, false, false, false, false, false, false);

WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);

ASSERT_EQ(2u, webTouchBuilder.touchesLength);

@@ -170,7 +173,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder)

activeTouchList->append(touch0);

activeTouchList->append(touch1);

movedTouchList->append(touch1);

WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);

ASSERT_EQ(2u, webTouchBuilder.touchesLength);

@@ -187,7 +190,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder)

RefPtrWillBeRawPtr<TouchList> releasedTouchList = TouchList::create();

activeTouchList->append(touch0);

releasedTouchList->append(touch1);

- RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), releasedTouchList.get(), EventTypeNames::touchend, domWindow, false, false, false, false, false, false);

+ RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), releasedTouchList.get(), EventTypeNames::touchend, domWindow, sourceDeviceFireTouchEvent, false, false, false, false, false, false);

WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);

ASSERT_EQ(2u, webTouchBuilder.touchesLength);

@@ -204,7 +207,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder)

RefPtrWillBeRawPtr<TouchList> cancelledTouchList = TouchList::create();

cancelledTouchList->append(touch0);

cancelledTouchList->append(touch1);

- RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), cancelledTouchList.get(), EventTypeNames::touchcancel, domWindow, false, false, false, false, false, false);

+ RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), cancelledTouchList.get(), EventTypeNames::touchcancel, domWindow, sourceDeviceFireTouchEvent, false, false, false, false, false, false);

WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);

ASSERT_EQ(2u, webTouchBuilder.touchesLength);

@@ -224,7 +227,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder)

touchList->append(touch);

changedTouchList->append(touch);

}

- RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), EventTypeNames::touchstart, domWindow, false, false, false, false, false, false);

WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);

ASSERT_EQ(static_cast<unsigned>(WebTouchEvent::touchesLengthCap), webTouchBuilder.touchesLength);

@@ -462,7 +465,7 @@ TEST(WebInputEventConversionTest, InputEventsScaling)

RefPtrWillBeRawPtr<Touch> touch = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), 0, FloatPoint(10, 9.5), FloatPoint(3.5, 2), FloatSize(4, 4.5), 0, 0);

RefPtrWillBeRawPtr<TouchList> touchList = TouchList::create();

touchList->append(touch);

- RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), EventTypeNames::touchmove, domWindow, false, false, false, false, false, false);

+ RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), EventTypeNames::touchmove, domWindow, InputDevice::touchEventInstance(), false, false, false, false, false, false);

WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);

ASSERT_EQ(1u, webTouchBuilder.touchesLength);

« Source/core/core.gypi ('K') | « Source/web/tests/WebFrameTest.cpp ('k') | no next file » | no next file with comments »