diff options
| author | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 05:31:26 +0000 |
|---|---|---|
| committer | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 05:31:26 +0000 |
| commit | fb0a93c66a3b32c5e2593b53e357d2c378c3930b (patch) | |
| tree | 02027293b4892c2c215d9b002b0b580543c2ad58 /ash/display/display_manager_unittest.cc | |
| parent | 5751fe1403e6acfe1c35bf5ade3aca3c0907d2d5 (diff) | |
| download | chromium_src-fb0a93c66a3b32c5e2593b53e357d2c378c3930b.zip chromium_src-fb0a93c66a3b32c5e2593b53e357d2c378c3930b.tar.gz chromium_src-fb0a93c66a3b32c5e2593b53e357d2c378c3930b.tar.bz2 | |
Revert 168974 - Undo all existing overscan settings before updating to a new overscan settings.
Revert Reason:
DisplayControllerTest.CursorDeviceScaleFactorSwapPrimary fails on Win Aura bot.
If an existing display has overscan setting and SetDisplayOverscan is called for
a different display, the display manager will call OnNativeDisplayChanged(), and
it will re-apply the overscan setting to other displays, so the effect could be
twice or more. We need to undo the existing settings beforehand.
BUG=161097
TEST=confirmed with the repro steps in the bug
Review URL: https://chromiumcodereview.appspot.com/11362259
TBR=mukai@chromium.org
Review URL: https://codereview.chromium.org/11414106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168989 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display/display_manager_unittest.cc')
| -rw-r--r-- | ash/display/display_manager_unittest.cc | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc index e7378b6..12ed8d20 100644 --- a/ash/display/display_manager_unittest.cc +++ b/ash/display/display_manager_unittest.cc @@ -234,15 +234,6 @@ TEST_F(DisplayManagerTest, MAYBE_OverscanInsetsTest) { EXPECT_EQ("12,514 378x376", display_manager()->GetDisplayAt(1)->bounds_in_pixel().ToString()); - // Make sure that SetOverscanInsets() is idempotent. - display_manager()->SetOverscanInsets(display1.id(), gfx::Insets()); - display_manager()->SetOverscanInsets( - display2.id(), gfx::Insets(13, 12, 11, 10)); - EXPECT_EQ("0,0 500x500", - display_manager()->GetDisplayAt(0)->bounds_in_pixel().ToString()); - EXPECT_EQ("12,514 378x376", - display_manager()->GetDisplayAt(1)->bounds_in_pixel().ToString()); - display_manager()->SetOverscanInsets( display2.id(), gfx::Insets(10, 11, 12, 13)); EXPECT_EQ("0,0 500x500", @@ -281,14 +272,6 @@ TEST_F(DisplayManagerTest, MAYBE_OverscanInsetsTest) { EXPECT_EQ("10,509 376x380", display_manager()->GetDisplayAt(1)->bounds_in_pixel().ToString()); EXPECT_EQ("188x190", display_manager()->GetDisplayAt(1)->size().ToString()); - - // Make sure switching primary display applies the overscan offset only once. - ash::Shell::GetInstance()->display_controller()->SetPrimaryDisplay( - ScreenAsh::GetSecondaryDisplay()); - EXPECT_EQ("0,0 500x500", - ScreenAsh::GetSecondaryDisplay().bounds_in_pixel().ToString()); - EXPECT_EQ("10,509 376x380", gfx::Screen::GetNativeScreen()-> - GetPrimaryDisplay().bounds_in_pixel().ToString()); } TEST_F(DisplayManagerTest, MAYBE_ZeroOverscanInsets) { |