Chromium Code Reviews| Index: Source/web/tests/WebFrameTest.cpp |
| diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp |
| index 0dd11957226bb663f2cd5f3f809ecfd5a8931602..415f6bf16362fe49ae220b865b914523f413edbc 100644 |
| --- a/Source/web/tests/WebFrameTest.cpp |
| +++ b/Source/web/tests/WebFrameTest.cpp |
| @@ -7622,6 +7622,18 @@ protected: |
| return event; |
| } |
| + void ScrollByWheel(FrameTestHelpers::WebViewHelper* webViewHelper, int windowX, int windowY, float deltaX, float deltaY) |
| + { |
| + WebMouseWheelEvent event; |
| + event.type = WebInputEvent::MouseWheel; |
| + event.deltaX = deltaX; |
| + event.deltaY = deltaY; |
| + event.windowX = windowX; |
| + event.windowY = windowY; |
| + event.canScroll = true; |
| + webViewHelper->webViewImpl()->handleInputEvent(event); |
| + } |
| + |
| void ScrollBegin(FrameTestHelpers::WebViewHelper* webViewHelper) |
| { |
| webViewHelper->webViewImpl()->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin)); |
| @@ -7832,6 +7844,26 @@ TEST_F(WebFrameOverscrollTest, ScaledPageRootLayerOverscrolled) |
| Mock::VerifyAndClearExpectations(&client); |
| } |
| +TEST_F(WebFrameOverscrollTest, ReportingLatestOverscrollForElasticOverscroll) |
| +{ |
| + OverscrollWebViewClient client; |
| + registerMockedHttpURLLoad("overscroll/overscroll.html"); |
| + FrameTestHelpers::WebViewHelper webViewHelper; |
| + webViewHelper.initializeAndLoad(m_baseURL + "overscroll/overscroll.html", true, 0, &client, configureAndroid); |
| + |
| + // On disabling elasticoverscroll, overscroll is not reported on MouseWheel. |
|
bokan
2015/06/26 17:40:41
Nit: s/elasticoverscroll/reportsWheelOverscroll
MuVen
2015/06/29 13:27:17
Done.
|
| + webViewHelper.webView()->settings()->setReportWheelOverscroll(false); |
| + EXPECT_CALL(client, didOverscroll(WebFloatSize(), WebFloatSize(), WebFloatPoint(), WebFloatSize())).Times(0); |
| + ScrollByWheel(&webViewHelper, 10, 10, 1000, 1000); |
| + Mock::VerifyAndClearExpectations(&client); |
| + |
| + // On enabling elasticoverscroll, overscroll is reported on MouseWheel. |
| + webViewHelper.webView()->settings()->setReportWheelOverscroll(true); |
| + EXPECT_CALL(client, didOverscroll(WebFloatSize(1000, 1000), WebFloatSize(1000, 1000), WebFloatPoint(), WebFloatSize())); |
| + ScrollByWheel(&webViewHelper, 10, 10, 1000, 1000); |
| + Mock::VerifyAndClearExpectations(&client); |
| +} |
| + |
| TEST_F(WebFrameTest, OrientationFrameDetach) |
| { |
| RuntimeEnabledFeatures::setOrientationEventEnabled(true); |