| Index: Source/web/tests/WebFrameTest.cpp
|
| diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
|
| index 4d4473ef76772ec5ff154a112d44b6b8664c9adf..aea50cc6e42b7ef5c439679e625a94f4f36614c0 100644
|
| --- a/Source/web/tests/WebFrameTest.cpp
|
| +++ b/Source/web/tests/WebFrameTest.cpp
|
| @@ -1591,20 +1591,6 @@ TEST_F(WebFrameTest, setPageScaleFactorWithOverlayScrollbarsDoesNotLayout)
|
|
|
| }
|
|
|
| -TEST_F(WebFrameTest, setPageScaleFactorBeforeFrameHasView)
|
| -{
|
| - registerMockedHttpURLLoad("fixed_layout.html");
|
| -
|
| - float pageScaleFactor = 3;
|
| - FrameTestHelpers::WebViewHelper webViewHelper;
|
| - webViewHelper.initializeAndLoad("about:html", true, 0, 0);
|
| - webViewHelper.webView()->setPageScaleFactor(pageScaleFactor);
|
| -
|
| - FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "fixed_layout.html");
|
| - WebCore::FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();
|
| - EXPECT_EQ(pageScaleFactor, view->visibleContentScaleFactor());
|
| -}
|
| -
|
| TEST_F(WebFrameTest, pageScaleFactorWrittenToHistoryItem)
|
| {
|
| UseMockScrollbarSettings mockScrollbarSettings;
|
| @@ -2176,6 +2162,7 @@ TEST_F(WebFrameTest, updateOverlayScrollbarLayers)
|
| FrameTestHelpers::WebViewHelper webViewHelper;
|
| webViewHelper.initialize(true, 0, fakeCompositingWebViewClient.get(), &configueCompositingWebView);
|
|
|
| + webViewHelper.webView()->setPageScaleFactorLimits(1, 1);
|
| webViewHelper.webView()->resize(WebSize(viewWidth, viewHeight));
|
| FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "large-div.html");
|
|
|
|
|