| Index: Source/web/tests/WebFrameTest.cpp
 | 
| diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
 | 
| index 38440c55dfa2364c855fe17d93ead9953cd137b7..cf31b95ea6e3288c3effe7502bf6edad1f8b1e01 100644
 | 
| --- a/Source/web/tests/WebFrameTest.cpp
 | 
| +++ b/Source/web/tests/WebFrameTest.cpp
 | 
| @@ -1782,6 +1782,74 @@ TEST_F(WebFrameTest, NoWideViewportAndScaleLessThanOneWithDeviceWidth)
 | 
|      EXPECT_NEAR(1.0f / client.m_screenInfo.deviceScaleFactor, webViewHelper.webView()->pageScaleFactor(), 0.01f);
 | 
|  }
 | 
|  
 | 
| +TEST_F(WebFrameTest, NoUserScalableQuirkIgnoresViewportScale)
 | 
| +{
 | 
| +    UseMockScrollbarSettings mockScrollbarSettings;
 | 
| +    registerMockedHttpURLLoad("viewport-initial-scale-and-user-scalable-no.html");
 | 
| +
 | 
| +    FixedLayoutTestWebViewClient client;
 | 
| +    int viewportWidth = 640;
 | 
| +    int viewportHeight = 480;
 | 
| +
 | 
| +    FrameTestHelpers::WebViewHelper webViewHelper;
 | 
| +    webViewHelper.initializeAndLoad(m_baseURL + "viewport-initial-scale-and-user-scalable-no.html", true, 0, &client);
 | 
| +    webViewHelper.webView()->settings()->setViewportEnabled(true);
 | 
| +    webViewHelper.webView()->settings()->setViewportMetaNonUserScalableQuirk(true);
 | 
| +    webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
 | 
| +    webViewHelper.webView()->layout();
 | 
| +
 | 
| +    EXPECT_NEAR(viewportWidth, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width(), 1.0f);
 | 
| +    EXPECT_NEAR(viewportHeight, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().height(), 1.0f);
 | 
| +    EXPECT_NEAR(1.0f, webViewHelper.webView()->pageScaleFactor(), 0.01f);
 | 
| +}
 | 
| +
 | 
| +TEST_F(WebFrameTest, NoUserScalableQuirkIgnoresViewportScaleForNonWideViewport)
 | 
| +{
 | 
| +    UseMockScrollbarSettings mockScrollbarSettings;
 | 
| +    registerMockedHttpURLLoad("viewport-initial-scale-and-user-scalable-no.html");
 | 
| +
 | 
| +    FixedLayoutTestWebViewClient client;
 | 
| +    client.m_screenInfo.deviceScaleFactor = 1.33f;
 | 
| +    int viewportWidth = 640;
 | 
| +    int viewportHeight = 480;
 | 
| +
 | 
| +    FrameTestHelpers::WebViewHelper webViewHelper;
 | 
| +    webViewHelper.initializeAndLoad(m_baseURL + "viewport-initial-scale-and-user-scalable-no.html", true, 0, &client);
 | 
| +    webViewHelper.webView()->settings()->setViewportEnabled(true);
 | 
| +    webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDPI(true);
 | 
| +    webViewHelper.webView()->settings()->setViewportMetaNonUserScalableQuirk(true);
 | 
| +    webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
 | 
| +    webViewHelper.webView()->settings()->setUseWideViewport(false);
 | 
| +    webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
 | 
| +    webViewHelper.webView()->layout();
 | 
| +
 | 
| +    EXPECT_NEAR(viewportWidth * client.m_screenInfo.deviceScaleFactor, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width(), 1.0f);
 | 
| +    EXPECT_NEAR(viewportHeight * client.m_screenInfo.deviceScaleFactor, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().height(), 1.0f);
 | 
| +    EXPECT_NEAR(1.0f / client.m_screenInfo.deviceScaleFactor, webViewHelper.webView()->pageScaleFactor(), 0.01f);
 | 
| +}
 | 
| +
 | 
| +TEST_F(WebFrameTest, NoUserScalableQuirkIgnoresViewportScaleForWideViewport)
 | 
| +{
 | 
| +    UseMockScrollbarSettings mockScrollbarSettings;
 | 
| +    registerMockedHttpURLLoad("viewport-2x-initial-scale-non-user-scalable.html");
 | 
| +
 | 
| +    FixedLayoutTestWebViewClient client;
 | 
| +    int viewportWidth = 640;
 | 
| +    int viewportHeight = 480;
 | 
| +
 | 
| +    FrameTestHelpers::WebViewHelper webViewHelper;
 | 
| +    webViewHelper.initializeAndLoad(m_baseURL + "viewport-2x-initial-scale-non-user-scalable.html", true, 0, &client);
 | 
| +    webViewHelper.webView()->settings()->setViewportEnabled(true);
 | 
| +    webViewHelper.webView()->settings()->setViewportMetaNonUserScalableQuirk(true);
 | 
| +    webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
 | 
| +    webViewHelper.webView()->settings()->setUseWideViewport(true);
 | 
| +    webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
 | 
| +
 | 
| +    EXPECT_NEAR(viewportWidth, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width(), 1.0f);
 | 
| +    EXPECT_NEAR(viewportHeight, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().height(), 1.0f);
 | 
| +    EXPECT_NEAR(1.0f, webViewHelper.webView()->pageScaleFactor(), 0.01f);
 | 
| +}
 | 
| +
 | 
|  class WebFrameResizeTest : public WebFrameTest {
 | 
|  protected:
 | 
|  
 | 
| 
 |