| Index: Source/web/tests/WebFrameTest.cpp
|
| diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
|
| index 18ffa947b56e73480958167843559d1b393a2c6c..7926da882a147c126f91cfda727dcaa4201bdffd 100644
|
| --- a/Source/web/tests/WebFrameTest.cpp
|
| +++ b/Source/web/tests/WebFrameTest.cpp
|
| @@ -7569,6 +7569,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));
|
| @@ -7779,6 +7791,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.
|
| + webViewHelper.webView()->settings()->setElasticOverscrollEnabled(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()->setElasticOverscrollEnabled(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);
|
|
|