| Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| index 1dd574f6455f36d7dc824bbc6d78a3970880c490..01d77f310d3672ec18a2d34876b710a01c58f8b0 100644
|
| --- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| @@ -8150,19 +8150,6 @@ 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;
|
| - event.hasPreciseScrollingDeltas = true;
|
| - webViewHelper->webViewImpl()->handleInputEvent(event);
|
| - }
|
| -
|
| void ScrollBegin(FrameTestHelpers::WebViewHelper* webViewHelper)
|
| {
|
| webViewHelper->webViewImpl()->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
|
| @@ -8410,56 +8397,6 @@ TEST_P(WebFrameOverscrollTest, NoOverscrollForSmallvalues)
|
| Mock::VerifyAndClearExpectations(&client);
|
| }
|
|
|
| -TEST_P(WebFrameOverscrollTest, ReportingLatestOverscrollForElasticOverscroll)
|
| -{
|
| - OverscrollWebViewClient client;
|
| - registerMockedHttpURLLoad("overscroll/overscroll.html");
|
| - FrameTestHelpers::WebViewHelper webViewHelper;
|
| - webViewHelper.initializeAndLoad(m_baseURL + "overscroll/overscroll.html", true, nullptr, &client, nullptr, configureAndroid);
|
| - webViewHelper.resize(WebSize(200, 200));
|
| -
|
| - EXPECT_CALL(client, didOverscroll(WebFloatSize(-1000, -1000), WebFloatSize(-1000, -1000), WebFloatPoint(), WebFloatSize()));
|
| - ScrollByWheel(&webViewHelper, 10, 10, 1000, 1000);
|
| - Mock::VerifyAndClearExpectations(&client);
|
| -}
|
| -
|
| -TEST_P(WebFrameOverscrollTest, ScrollPageWithBodyExplicitlyOverflowing)
|
| -{
|
| - RuntimeEnabledFeatures::setScrollTopLeftInteropEnabled(false);
|
| -
|
| - OverscrollWebViewClient client;
|
| - registerMockedHttpURLLoad("mouse-wheel-overflow-body.html");
|
| - FrameTestHelpers::WebViewHelper webViewHelper;
|
| - webViewHelper.initializeAndLoad(m_baseURL + "mouse-wheel-overflow-body.html", true, nullptr, &client, nullptr, configureAndroid);
|
| - webViewHelper.resize(WebSize(800, 600));
|
| -
|
| - FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();
|
| - Document* document = toWebLocalFrameImpl(webViewHelper.webViewImpl()->mainFrame())->frame()->document();
|
| -
|
| - {
|
| - EXPECT_CALL(client, didOverscroll(_, _, _, _)).Times(0);
|
| - ScrollByWheel(&webViewHelper, 100, 100, 0, -450);
|
| -
|
| - LayoutBox* layoutBody = toLayoutBox(document->body()->layoutObject());
|
| - ASSERT_EQ(400, layoutBody->getScrollableArea()->scrollPosition().y());
|
| - ASSERT_EQ(400, layoutBody->getScrollableArea()->maximumScrollPosition().y());
|
| -
|
| - Mock::VerifyAndClearExpectations(&client);
|
| - }
|
| -
|
| - view->setScrollPosition(DoublePoint(0, 0), ProgrammaticScroll);
|
| -
|
| - {
|
| - EXPECT_CALL(client, didOverscroll(WebFloatSize(0, 200), WebFloatSize(0, 200), WebFloatPoint(), WebFloatSize()));
|
| - ScrollByWheel(&webViewHelper, 100, 100, 0, -300);
|
| -
|
| - ASSERT_EQ(100, view->getScrollableArea()->scrollPosition().y());
|
| - ASSERT_EQ(100, view->getScrollableArea()->maximumScrollPosition().y());
|
| -
|
| - Mock::VerifyAndClearExpectations(&client);
|
| - }
|
| -}
|
| -
|
| TEST_F(WebFrameTest, OrientationFrameDetach)
|
| {
|
| RuntimeEnabledFeatures::setOrientationEventEnabled(true);
|
|
|