Make targetDensity-dpi account for deviceScaleFactor correctly.

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 848 matching lines @@
     EXPECT_EQ(980, webViewImpl->mainFrameImpl()->frameView()->contentsSize().width());
 }
 
 TEST_F(WebFrameTest, targetDensityDpiHigh)
 {
     WebCore::Settings::setMockScrollbarsEnabled(true);
     WebCore::Settings::setUsesOverlayScrollbars(true);
     registerMockedHttpURLLoad("viewport-target-densitydpi-high.html");
 
     FixedLayoutTestWebViewClient client;
-    client.m_screenInfo.deviceScaleFactor = 4.0f / 3.0f;
+    // high-dpi = 240
+    float targetDpi = 240.0f;
+    float deviceScaleFactors[] = { 1.0f, 4.0f / 3.0f, 2.0f };
     int viewportWidth = 640;
     int viewportHeight = 480;
 
-    m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-target-densitydpi-high.html", true, 0, &client);
-    m_webView->enableFixedLayoutMode(true);
-    m_webView->settings()->setViewportEnabled(true);
-    m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
-    m_webView->resize(WebSize(viewportWidth, viewportHeight));
+    for (size_t i = 0; i < ARRAY_SIZE(deviceScaleFactors); ++i) {
+        float deviceScaleFactor = deviceScaleFactors[i];
+        float deviceDpi = deviceScaleFactor * 160.0f;
+        client.m_screenInfo.deviceScaleFactor = deviceScaleFactor;
 
-    // high-dpi = 240, device-dpi = 160
-    EXPECT_NEAR(viewportWidth * (240.0f / 160.0f), m_webView->fixedLayoutSize().width, 1.0f);
-    EXPECT_NEAR(viewportHeight * (240.0f / 160.0f), m_webView->fixedLayoutSize().height, 1.0f);
-    EXPECT_NEAR(160.0f / 240.0f, m_webView->pageScaleFactor(), 0.01f);
+        m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-target-densitydpi-high.html", true, 0, &client);
+        m_webView->enableFixedLayoutMode(true);
+        m_webView->settings()->setViewportEnabled(true);
+        m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
+        m_webView->resize(WebSize(viewportWidth, viewportHeight));
+
+        // We need to account for the fact that logical pixels are unconditionally multiplied by deviceScaleFactor to produce
+        // physical pixels.
+        float viewportRatio = deviceScaleFactor * targetDpi / deviceDpi;
+        EXPECT_NEAR(viewportWidth * viewportRatio, m_webView->fixedLayoutSize().width, 1.0f);
+        EXPECT_NEAR(viewportHeight * viewportRatio, m_webView->fixedLayoutSize().height, 1.0f);
+        EXPECT_NEAR(deviceDpi / (targetDpi * deviceScaleFactor), m_webView->pageScaleFactor(), 0.01f);
+
+        m_webView->close();
+        m_webView = 0;
+    }
 }
 
 TEST_F(WebFrameTest, targetDensityDpiDevice)
 {
     WebCore::Settings::setMockScrollbarsEnabled(true);
     WebCore::Settings::setUsesOverlayScrollbars(true);
     registerMockedHttpURLLoad("viewport-target-densitydpi-device.html");
 
     float deviceScaleFactors[] = { 1.0f, 4.0f / 3.0f, 2.0f };
 
@@ skipping 2692 matching lines @@
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "push_state.html", true, 0, &client);
     runPendingTasks();
 
     EXPECT_EQ(client.startLoadingCount(), 2);
     EXPECT_EQ(client.stopLoadingCount(), 2);
     m_webView->close();
     m_webView = 0;
 }
 
 } // namespace