Unified Desktop: Support 2xDSF display

ash/display/display_manager_unittest.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 "ash/display/display_manager.h"
 
+#include "ash/accelerators/accelerator_commands.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_util.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
@@ skipping 1527 matching lines @@
   // 500 * 500 / 300 + 400 ~= 1233.
   EXPECT_EQ("1233x500", screen->GetPrimaryDisplay().size().ToString());
 
   // Switch back to extended desktop.
   display_manager()->SetDefaultMultiDisplayMode(DisplayManager::EXTENDED);
   display_manager()->ReconfigureDisplays();
   EXPECT_EQ("500x300", screen->GetPrimaryDisplay().size().ToString());
   EXPECT_EQ("400x500", ScreenUtil::GetSecondaryDisplay().size().ToString());
 }
 
+TEST_F(DisplayManagerTest, UnifiedDesktopWith2xDSF) {
+  if (!SupportsMultipleDisplays())
+    return;
+  // Don't check root window destruction in unified mode.
+  Shell::GetPrimaryRootWindow()->RemoveObserver(this);
+
+  test::DisplayManagerTestApi::EnableUnifiedDesktopForTest();
+  gfx::Screen* screen =
+      gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE);
+
+  // 2nd display is 2x.
+  UpdateDisplay("400x500,1000x800*2");
+  DisplayInfo info =
+      display_manager()->GetDisplayInfo(screen->GetPrimaryDisplay().id());
+  EXPECT_EQ(2u, info.display_modes().size());
+  EXPECT_EQ("1640x800", info.display_modes()[0].size.ToString());
+  EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor);
+  EXPECT_EQ("1025x500", info.display_modes()[1].size.ToString());
+  EXPECT_EQ(1.0f, info.display_modes()[1].device_scale_factor);
+
+  // It defaults to the highest resolution. With 2x DSF,
+  // (800 / 500 * 400 + 500) /2 = 820
+  EXPECT_EQ("820x400", screen->GetPrimaryDisplay().size().ToString());
+  EXPECT_EQ("820x400",
+            Shell::GetPrimaryRootWindow()->bounds().size().ToString());
+  accelerators::ZoomInternalDisplay(true);
+  // For 1x, 400 + 500 / 800 * 100 = 1025.
+  EXPECT_EQ("1025x500", screen->GetPrimaryDisplay().size().ToString());
+  EXPECT_EQ("1025x500",
+            Shell::GetPrimaryRootWindow()->bounds().size().ToString());
+
+  // 1st display is 2x.
+  UpdateDisplay("1200x800*2,1000x1000");
+  info = display_manager()->GetDisplayInfo(screen->GetPrimaryDisplay().id());
+  EXPECT_EQ(2u, info.display_modes().size());
+  EXPECT_EQ("2000x800", info.display_modes()[0].size.ToString());
+  EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor);
+  EXPECT_EQ("2500x1000", info.display_modes()[1].size.ToString());
+  EXPECT_EQ(1.0f, info.display_modes()[1].device_scale_factor);
+
+  // It defaults to the highest resolution (1x).
+  // 1000 / 800 * 1200 + 1000 = 2500
+  EXPECT_EQ("2500x1000", screen->GetPrimaryDisplay().size().ToString());
+  EXPECT_EQ("2500x1000",
+            Shell::GetPrimaryRootWindow()->bounds().size().ToString());
+  accelerators::ZoomInternalDisplay(false);
+  // For 2x, (800 / 1000 * 1000 + 1200) / 2 = 1000
+  EXPECT_EQ("1000x400", screen->GetPrimaryDisplay().size().ToString());
+  EXPECT_EQ("1000x400",
+            Shell::GetPrimaryRootWindow()->bounds().size().ToString());
+
+  // Both displays are 2x.
+  // 1st display is 2x.
+  UpdateDisplay("1200x800*2,1000x1000*2");
+  info = display_manager()->GetDisplayInfo(screen->GetPrimaryDisplay().id());
+  EXPECT_EQ(2u, info.display_modes().size());
+  EXPECT_EQ("2000x800", info.display_modes()[0].size.ToString());
+  EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor);
+  EXPECT_EQ("2500x1000", info.display_modes()[1].size.ToString());
+  EXPECT_EQ(2.0f, info.display_modes()[1].device_scale_factor);
+
+  EXPECT_EQ("1250x500", screen->GetPrimaryDisplay().size().ToString());
+  EXPECT_EQ("1250x500",
+            Shell::GetPrimaryRootWindow()->bounds().size().ToString());
+  accelerators::ZoomInternalDisplay(false);
+  EXPECT_EQ("1000x400", screen->GetPrimaryDisplay().size().ToString());
+  EXPECT_EQ("1000x400",
+            Shell::GetPrimaryRootWindow()->bounds().size().ToString());
+
+  // Both displays have the same physical height, with the first display
+  // being 2x.
+  UpdateDisplay("1000x800*2,300x800");
+  info = display_manager()->GetDisplayInfo(screen->GetPrimaryDisplay().id());
+  EXPECT_EQ(2u, info.display_modes().size());
+  EXPECT_EQ("1300x800", info.display_modes()[0].size.ToString());
+  EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor);
+  EXPECT_EQ("1300x800", info.display_modes()[1].size.ToString());
+  EXPECT_EQ(1.0f, info.display_modes()[1].device_scale_factor);
+
+  EXPECT_EQ("650x400", screen->GetPrimaryDisplay().size().ToString());
+  EXPECT_EQ("650x400",
+            Shell::GetPrimaryRootWindow()->bounds().size().ToString());
+  accelerators::ZoomInternalDisplay(true);
+  EXPECT_EQ("1300x800", screen->GetPrimaryDisplay().size().ToString());
+  EXPECT_EQ("1300x800",
+            Shell::GetPrimaryRootWindow()->bounds().size().ToString());
+
+  // Both displays have the same physical height, with the second display
+  // being 2x.
+  UpdateDisplay("1000x800,300x800*2");
+  EXPECT_EQ(2u, info.display_modes().size());
+  EXPECT_EQ("1300x800", info.display_modes()[0].size.ToString());
+  EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor);
+  EXPECT_EQ("1300x800", info.display_modes()[1].size.ToString());
+  EXPECT_EQ(1.0f, info.display_modes()[1].device_scale_factor);
+
+  EXPECT_EQ("1300x800", screen->GetPrimaryDisplay().size().ToString());
+  EXPECT_EQ("1300x800",
+            Shell::GetPrimaryRootWindow()->bounds().size().ToString());
+  accelerators::ZoomInternalDisplay(false);
+  EXPECT_EQ("650x400", screen->GetPrimaryDisplay().size().ToString());
+  EXPECT_EQ("650x400",
+            Shell::GetPrimaryRootWindow()->bounds().size().ToString());
+}
+
 // Updating displays again in unified desktop mode should not crash.
 // crbug.com/491094.
 TEST_F(DisplayManagerTest, ConfigureUnifiedTwice) {
   if (!SupportsMultipleDisplays())
     return;
   // Don't check root window destruction in unified mode.
   Shell::GetPrimaryRootWindow()->RemoveObserver(this);
 
   UpdateDisplay("300x200,400x500");
   // Mirror windows are created in a posted task.
@@ skipping 216 matching lines @@
 
   EXPECT_EQ(gfx::Display::ROTATE_90,
             info.GetRotation(gfx::Display::ROTATION_SOURCE_USER));
   EXPECT_EQ(gfx::Display::ROTATE_90,
             info.GetRotation(gfx::Display::ROTATION_SOURCE_ACTIVE));
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace ash