From 6668b07fcd51f86be243b9e08e667224e30c0cf8 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 27 Jun 2012 09:28:46 +0200 Subject: Imported WebKit commit 26cd9bd8ab0471ffe987c9b60368f63dc0f1f31b (http://svn.webkit.org/repository/webkit/trunk@121325) New snapshot with more Windows build fixes --- Source/WebKit/chromium/tests/WebFrameTest.cpp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'Source/WebKit/chromium/tests/WebFrameTest.cpp') diff --git a/Source/WebKit/chromium/tests/WebFrameTest.cpp b/Source/WebKit/chromium/tests/WebFrameTest.cpp index 40705808d..4e2b0c5ea 100644 --- a/Source/WebKit/chromium/tests/WebFrameTest.cpp +++ b/Source/WebKit/chromium/tests/WebFrameTest.cpp @@ -284,6 +284,28 @@ TEST_F(WebFrameTest, FixedLayoutInitializeAtMinimumPageScale) } #endif +TEST_F(WebFrameTest, CanOverrideMaximumScaleFactor) +{ + registerMockedHttpURLLoad("no_scale_for_you.html"); + + FixedLayoutTestWebViewClient client; + client.m_screenInfo.horizontalDPI = 160; + int viewportWidth = 640; + int viewportHeight = 480; + client.m_windowRect = WebRect(0, 0, viewportWidth, viewportHeight); + + WebViewImpl* webViewImpl = static_cast(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "no_scale_for_you.html", true, 0, &client)); + webViewImpl->enableFixedLayoutMode(true); + webViewImpl->settings()->setViewportEnabled(true); + webViewImpl->resize(WebSize(viewportWidth, viewportHeight)); + + EXPECT_EQ(1.0f, webViewImpl->maximumPageScaleFactor()); + + webViewImpl->setIgnoreViewportTagMaximumScale(true); + + EXPECT_EQ(4.0f, webViewImpl->maximumPageScaleFactor()); +} + #if ENABLE(GESTURE_EVENTS) TEST_F(WebFrameTest, DivAutoZoomParamsTest) { -- cgit v1.2.1