Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1574)

Unified Diff: Source/web/tests/WebFrameTest.cpp

Issue 190723007: Fix tests to be compatible with Android scale initialization. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reupload Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/tests/TouchActionTest.cpp ('k') | Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « Source/web/tests/TouchActionTest.cpp ('k') | Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698