Index: Source/web/tests/WebFrameTest.cpp |
diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp |
index 2ace031af1056175cb57ce2b8e9a2a66058c1d07..dfb3e4e130dc152b01bbb73b06cfb8100aca461d 100644 |
--- a/Source/web/tests/WebFrameTest.cpp |
+++ b/Source/web/tests/WebFrameTest.cpp |
@@ -1564,21 +1564,6 @@ TEST_F(WebFrameTest, setPageScaleFactorWithOverlayScrollbarsDoesNotLayout) |
} |
-TEST_F(WebFrameTest, setPageScaleFactorBeforeFrameHasView) |
bokan
2014/03/10 14:21:18
Is the reason this doesn't make sense because page
aelias_OOO_until_Jul13
2014/03/10 21:43:42
Right. Early-ish in the load (after contents widt
|
-{ |
- registerMockedHttpURLLoad("fixed_layout.html"); |
- |
- float pageScaleFactor = 3; |
- FrameTestHelpers::WebViewHelper webViewHelper; |
- webViewHelper.initializeAndLoad("about:html", true, 0, 0); |
- webViewHelper.webView()->setPageScaleFactor(pageScaleFactor, WebPoint()); |
- |
- FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "fixed_layout.html"); |
- Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests(); |
- WebCore::FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView(); |
- EXPECT_EQ(pageScaleFactor, view->visibleContentScaleFactor()); |
-} |
- |
TEST_F(WebFrameTest, pageScaleFactorWrittenToHistoryItem) |
{ |
UseMockScrollbarSettings mockScrollbarSettings; |
@@ -2144,6 +2129,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"); |
Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests(); |