| Index: Source/web/tests/WebInputEventConversionTest.cpp
|
| diff --git a/Source/web/tests/WebInputEventConversionTest.cpp b/Source/web/tests/WebInputEventConversionTest.cpp
|
| index 01d4e8f365695ed92001b1c155609a5ec283ffe3..fc51041ad8c0fc539d8a552cc65eeaab02470eaa 100644
|
| --- a/Source/web/tests/WebInputEventConversionTest.cpp
|
| +++ b/Source/web/tests/WebInputEventConversionTest.cpp
|
| @@ -122,9 +122,11 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder)
|
| p0.radiusY = p1.radiusX = 5.f;
|
| p0.rotationAngle = p1.rotationAngle = 1.f;
|
| p0.force = p1.force = 25.f;
|
| + p0.tilt = p1.tilt = 30.f;
|
| + p0.tiltDirection = p1.tiltDirection = 45.f;
|
|
|
| - 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);
|
| + 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, p0.tilt, p0.tiltDirection);
|
| + 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, p1.tilt, p1.tiltDirection);
|
|
|
| // Test touchstart.
|
| {
|
| @@ -203,7 +205,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder)
|
| RefPtrWillBeRawPtr<TouchList> touchList = TouchList::create();
|
| RefPtrWillBeRawPtr<TouchList> changedTouchList = TouchList::create();
|
| for (unsigned i = 0; i <= static_cast<unsigned>(WebTouchEvent::touchesLengthCap) * 2; ++i) {
|
| - RefPtrWillBeRawPtr<Touch> touch = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), i, p0.screenPosition, p0.position, FloatSize(p0.radiusX, p0.radiusY), p0.rotationAngle, p0.force);
|
| + RefPtrWillBeRawPtr<Touch> touch = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), i, p0.screenPosition, p0.position, FloatSize(p0.radiusX, p0.radiusY), p0.rotationAngle, p0.force, p0.tilt, p0.tiltDirection);
|
| touchList->append(touch);
|
| changedTouchList->append(touch);
|
| }
|
| @@ -442,7 +444,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<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, 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);
|
|
|