[DevTools] Handle emulated device scale factor and original device scale factor properly.

content/renderer/render_view_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/win/windows_version.h"
 #include "build/build_config.h"
+#include "cc/trees/layer_tree_host.h"
 #include "content/child/request_extra_data.h"
 #include "content/child/service_worker/service_worker_network_provider.h"
+#include "content/common/content_switches_internal.h"
 #include "content/common/frame_messages.h"
 #include "content/common/frame_replication_state.h"
 #include "content/common/site_isolation_policy.h"
 #include "content/common/ssl_status_serialization.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/web_ui_controller_factory.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/page_zoom.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/url_utils.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/document_state.h"
 #include "content/public/renderer/navigation_state.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/frame_load_waiter.h"
 #include "content/public/test/render_view_test.h"
 #include "content/public/test/test_utils.h"
 #include "content/renderer/accessibility/renderer_accessibility.h"
 #include "content/renderer/devtools/devtools_agent.h"
+#include "content/renderer/gpu/render_widget_compositor.h"
 #include "content/renderer/history_controller.h"
 #include "content/renderer/history_serialization.h"
 #include "content/renderer/navigation_state_impl.h"
 #include "content/renderer/render_process.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_browser_context.h"
 #include "content/test/mock_keyboard.h"
 #include "content/test/test_render_frame.h"
 #include "net/base/net_errors.h"
@@ skipping 359 matching lines @@
   // Blink settings may be specified on the command line, which must
   // be configured before RenderViewImplTest::SetUp runs. Thus we make
   // SetUp() a no-op, and expose RenderViewImplTest::SetUp() via
   // DoSetUp(), to allow tests to perform command line modifications
   // before RenderViewImplTest::SetUp is run. Each test must invoke
   // DoSetUp manually once pre-SetUp configuration is complete.
   void SetUp() override {}
 };
 
 class RenderViewImplScaleFactorTest : public RenderViewImplBlinkSettingsTest {
- public:
+ protected:
   void SetDeviceScaleFactor(float dsf) {
     ResizeParams params;
     params.screen_info.deviceScaleFactor = dsf;
     params.new_size = gfx::Size(100, 100);
     params.physical_backing_size = gfx::Size(200, 200);
     params.visible_viewport_size = params.new_size;
     params.needs_resize_ack = false;
     view()->OnResize(params);
     ASSERT_EQ(dsf, view()->device_scale_factor_);
   }
+
+  void TestEmulatedSizeDprDsf(int width, int height, float dpr,
+                              float compositor_dsf) {
+    static base::string16 get_width =
+        base::ASCIIToUTF16("Number(window.innerWidth)");
+    static base::string16 get_height =
+        base::ASCIIToUTF16("Number(window.innerHeight)");
+    static base::string16 get_dpr =
+        base::ASCIIToUTF16("Number(window.devicePixelRatio * 10)");
+
+    int emulated_width, emulated_height;
+    int emulated_dpr;
+    blink::WebDeviceEmulationParams params;
+    params.viewSize.width = width;
+    params.viewSize.height = height;
+    params.deviceScaleFactor = dpr;
+    view()->OnEnableDeviceEmulation(params);
+    EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(get_width, &emulated_width));
+    EXPECT_EQ(width, emulated_width);
+    EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(get_height,
+                                                   &emulated_height));
+    EXPECT_EQ(height, emulated_height);
+    EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(get_dpr, &emulated_dpr));
+    EXPECT_EQ(static_cast<int>(dpr * 10), emulated_dpr);
+    EXPECT_EQ(compositor_dsf,
+              view()->compositor()->layer_tree_host()->device_scale_factor());
+  }
 };
 
 // Ensure that the main RenderFrame is deleted and cleared from the RenderView
 // after closing it.
 TEST_F(RenderViewImplTest, RenderFrameClearedAfterClose) {
   // Create a new main frame RenderFrame so that we don't interfere with the
   // shutdown of frame() in RenderViewTest.TearDown.
   blink::WebURLRequest popup_request(GURL("http://foo.com"));
   blink::WebView* new_web_view = view()->createView(
       GetMainFrame(), popup_request, blink::WebWindowFeatures(), "foo",
@@ skipping 2007 matching lines @@
 
   frame()->SetAccessibilityMode(AccessibilityModeOff);
   ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());
   ASSERT_EQ((RendererAccessibility*) NULL, frame()->renderer_accessibility());
 
   frame()->SetAccessibilityMode(AccessibilityModeComplete);
   ASSERT_EQ(AccessibilityModeComplete, frame()->accessibility_mode());
   ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());
 }
 
-TEST_F(RenderViewImplTest, ScreenMetricsEmulation) {
-  LoadHTML("<body style='min-height:1000px;'></body>");
-
-  blink::WebDeviceEmulationParams params;
-  base::string16 get_width = base::ASCIIToUTF16("Number(window.innerWidth)");
-  base::string16 get_height = base::ASCIIToUTF16("Number(window.innerHeight)");
-  int width, height;
-
-  params.viewSize.width = 327;
-  params.viewSize.height = 415;
-  view()->OnEnableDeviceEmulation(params);
-  EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(get_width, &width));
-  EXPECT_EQ(params.viewSize.width, width);
-  EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(get_height, &height));
-  EXPECT_EQ(params.viewSize.height, height);
-
-  params.viewSize.width = 1005;
-  params.viewSize.height = 1102;
-  view()->OnEnableDeviceEmulation(params);
-  EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(get_width, &width));
-  EXPECT_EQ(params.viewSize.width, width);
-  EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(get_height, &height));
-  EXPECT_EQ(params.viewSize.height, height);
-
-  view()->OnDisableDeviceEmulation();
-
-  view()->OnEnableDeviceEmulation(params);
-  // Don't disable here to test that emulation is being shutdown properly.
-}
-
 // Sanity check for the Navigation Timing API |navigationStart| override. We
 // are asserting only most basic constraints, as TimeTicks (passed as the
 // override) are not comparable with the wall time (returned by the Blink API).
 TEST_F(RenderViewImplTest, NavigationStartOverride) {
   // Verify that a navigation that claims to have started in the future - 42
   // days from now is *not* reported as one that starts in the future; as we
   // sanitize the override allowing a maximum of ::Now().
   CommonNavigationParams late_common_params;
   late_common_params.url = GURL("data:text/html,<div>Another page</div>");
   late_common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
@@ skipping 148 matching lines @@
 
 TEST_F(RenderViewImplBlinkSettingsTest, Negative) {
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kBlinkSettings,
       "multiTargetTapNotificationEnabled=false,viewportEnabled=true");
   DoSetUp();
   EXPECT_FALSE(settings()->multiTargetTapNotificationEnabled());
   EXPECT_TRUE(settings()->viewportEnabled());
 }
 
-#if !defined(OS_CHROMEOS)
-// UseZoomForDSF is enabled on ChromeOS.
 TEST_F(RenderViewImplScaleFactorTest, ConverViewportToWindowWithoutZoomForDSF) {
   DoSetUp();
+  if (IsUseZoomForDSFEnabled())
+    return;
   SetDeviceScaleFactor(2.f);
   blink::WebRect rect(20, 10, 200, 100);
   view()->convertViewportToWindow(&rect);
   EXPECT_EQ(20, rect.x);
   EXPECT_EQ(10, rect.y);
   EXPECT_EQ(200, rect.width);
   EXPECT_EQ(100, rect.height);
 }
-#endif
+
+TEST_F(RenderViewImplScaleFactorTest, ScreenMetricsEmulationWithOriginalDSF1) {

[kinuko, 2016/03/03 08:29:08]

DSF1 / DSF2 comes from SetDeviceScaleFactor 1.f and 2.f, respectively?  (Looked
a bit cryptic at first look)

+  DoSetUp();
+  SetDeviceScaleFactor(1.f);
+
+  LoadHTML("<body style='min-height:1000px;'></body>");
+  {
+    SCOPED_TRACE("327x415 1dpr");
+    TestEmulatedSizeDprDsf(327, 415, 1.f, 1.f);
+  }
+  {
+    SCOPED_TRACE("327x415 1.5dpr");
+    TestEmulatedSizeDprDsf(327, 415, 1.5f, 1.f);
+  }
+  {
+    SCOPED_TRACE("1005x1102 2dpr");
+    TestEmulatedSizeDprDsf(1005, 1102, 2.f, 1.f);
+  }
+  {
+    SCOPED_TRACE("1005x1102 3dpr");
+    TestEmulatedSizeDprDsf(1005, 1102, 3.f, 1.f);
+  }
+
+  view()->OnDisableDeviceEmulation();
+
+  blink::WebDeviceEmulationParams params;
+  view()->OnEnableDeviceEmulation(params);
+  // Don't disable here to test that emulation is being shutdown properly.
+}
+
+TEST_F(RenderViewImplScaleFactorTest, ScreenMetricsEmulationWithOriginalDSF2) {
+  DoSetUp();
+  SetDeviceScaleFactor(2.f);
+  float compositor_dsf =
+      IsUseZoomForDSFEnabled() ? 1.f : 2.f;
+
+  LoadHTML("<body style='min-height:1000px;'></body>");
+  {
+    SCOPED_TRACE("327x415 1dpr");
+    TestEmulatedSizeDprDsf(327, 415, 1.f, compositor_dsf);
+  }
+  {
+    SCOPED_TRACE("327x415 1.5dpr");
+    TestEmulatedSizeDprDsf(327, 415, 1.5f, compositor_dsf);
+  }
+  {
+    SCOPED_TRACE("1005x1102 2dpr");
+    TestEmulatedSizeDprDsf(1005, 1102, 2.f, compositor_dsf);
+  }
+  {
+    SCOPED_TRACE("1005x1102 3dpr");
+    TestEmulatedSizeDprDsf(1005, 1102, 3.f, compositor_dsf);
+  }
+
+  view()->OnDisableDeviceEmulation();
+
+  blink::WebDeviceEmulationParams params;
+  view()->OnEnableDeviceEmulation(params);
+  // Don't disable here to test that emulation is being shutdown properly.
+}
 
 TEST_F(RenderViewImplScaleFactorTest, ConverViewportToWindowWithZoomForDSF) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableUseZoomForDSF);
   DoSetUp();
   SetDeviceScaleFactor(1.f);
   {
     blink::WebRect rect(20, 10, 200, 100);
     view()->convertViewportToWindow(&rect);
     EXPECT_EQ(20, rect.x);
@@ skipping 112 matching lines @@
       FROM_HERE,
       base::Bind(&DevToolsAgentTest::CloseWhilePaused, base::Unretained(this)));
   ExecuteJavaScriptForTests("debugger;");
 
   // CloseWhilePaused should resume execution and continue here.
   EXPECT_FALSE(IsPaused());
   Detach();
 }
 
 }  // namespace content