Zoom instead of autosizing for desktop sites.

Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2070 matching lines @@
     EXPECT_EQ(1.0f, webViewHelper.webView()->minimumPageScaleFactor());
     EXPECT_EQ(5.0f, webViewHelper.webView()->maximumPageScaleFactor());
 
     webViewHelper.webView()->setIgnoreViewportTagScaleLimits(false);
     webViewHelper.webView()->layout();
 
     EXPECT_EQ(2.0f, webViewHelper.webView()->minimumPageScaleFactor());
     EXPECT_EQ(2.0f, webViewHelper.webView()->maximumPageScaleFactor());
 }
 
+TEST_F(WebFrameTest, DeviceScaleAdjustmentReducesLayoutWidth)
+{
+    UseMockScrollbarSettings mockScrollbarSettings;
+
+    registerMockedHttpURLLoad("hello_world.html");
+
+    int viewportWidth = 1280;
+    int viewportHeight = 800;
+    float deviceScaleAdjustment = 1.3f;
+
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    webViewHelper.initializeAndLoad(m_baseURL + "hello_world.html", true);
+    webViewHelper.webView()->settings()->setViewportEnabled(true);
+    webViewHelper.webView()->settings()->setDeviceScaleAdjustment(deviceScaleAdjustment);
+
+    webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
+    webViewHelper.webView()->layout();
+
+    EXPECT_EQ(static_cast<int>(viewportWidth / deviceScaleAdjustment),
+        webViewHelper.webViewImpl()->page()->mainFrame()->view()->layoutSize().width());
+}
+
 TEST_F(WebFrameTest, updateOverlayScrollbarLayers)
 {
     UseMockScrollbarSettings mockScrollbarSettings;
 
     registerMockedHttpURLLoad("large-div.html");
 
     int viewWidth = 500;
     int viewHeight = 500;
 
     OwnPtr<FakeCompositingWebViewClient> fakeCompositingWebViewClient = adoptPtr(new FakeCompositingWebViewClient());
@@ skipping 2793 matching lines @@
 
     FrameTestHelpers::loadFrame(frame,
         "javascript:window.frames[1].location.assign('" + m_baseURL + "find.html')");
     runPendingTasks();
     Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
     EXPECT_EQ(client.frame(), iframe);
     EXPECT_FALSE(client.replacesCurrentHistoryItem());
 }
 
 } // namespace