Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1056)

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

Issue 1308313005: Modify gesture event types for WebView-tag scroll bubbling. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix test expectation. Created 5 years, 3 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 f5e300d03dc0218118aec46afec595f610924bce..7f8013bb2d1c1c8a1184ecaab1599337226e52ba 100644
--- a/Source/web/tests/WebInputEventConversionTest.cpp
+++ b/Source/web/tests/WebInputEventConversionTest.cpp
@@ -434,9 +434,9 @@ TEST(WebInputEventConversionTest, InputEventsScaling)
{
PlatformGestureEvent platformGestureEvent(PlatformEvent::GestureScrollUpdate, IntPoint(10, 12), IntPoint(20, 22), IntSize(25, 27), 0,
false, false, false, false);
- platformGestureEvent.setScrollGestureData(30, 32, 40, 42, true, true);
+ platformGestureEvent.setScrollGestureData(30, 32, 40, 42, true, 0, true);
// FIXME: GestureEvent does not preserve velocityX, velocityY,
- // preventPropagation, or inertial. It also fails to scale
+ // or preventPropagation. It also fails to scale
// coordinates (x, y, deltaX, deltaY) to the page scale. This
// may lead to unexpected bugs if a PlatformGestureEvent is
// transformed into WebGestureEvent and back.
@@ -451,7 +451,7 @@ TEST(WebInputEventConversionTest, InputEventsScaling)
EXPECT_EQ(32, webGestureBuilder.data.scrollUpdate.deltaY);
EXPECT_EQ(0, webGestureBuilder.data.scrollUpdate.velocityX);
EXPECT_EQ(0, webGestureBuilder.data.scrollUpdate.velocityY);
- EXPECT_FALSE(webGestureBuilder.data.scrollUpdate.inertial);
+ EXPECT_TRUE(webGestureBuilder.data.scrollUpdate.inertial);
EXPECT_FALSE(webGestureBuilder.data.scrollUpdate.preventPropagation);
}
@@ -874,7 +874,7 @@ TEST(WebInputEventConversionTest, WebMouseWheelEventBuilder)
RefPtrWillBeRawPtr<Document> document = toLocalFrame(webViewImpl->page()->mainFrame())->document();
RefPtrWillBeRawPtr<WheelEvent> event = WheelEvent::create(FloatPoint(1, 3), FloatPoint(5, 10),
WheelEvent::DOM_DELTA_PAGE, document.get()->domWindow(), IntPoint(2, 6), IntPoint(10, 30),
- true, false, false, false, 0, true, true, Event::RailsModeHorizontal);
+ true, false, false, false, 0, true, 0, true, Event::RailsModeHorizontal);
WebMouseWheelEventBuilder webMouseWheel(toLocalFrame(webViewImpl->page()->mainFrame())->view(), document.get()->layoutView(), *event);
EXPECT_EQ(1, webMouseWheel.wheelTicksX);
EXPECT_EQ(3, webMouseWheel.wheelTicksY);

Powered by Google App Engine
This is Rietveld 408576698