Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3498)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/resolution_notification_controller_unittest.cc

Issue 161413002: Revert of Read compositor VSync information from platform, when possible (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/display_manager_unittest.cc ('k') | ash/wm/window_animations.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/resolution_notification_controller_unittest.cc
diff --git a/ash/display/resolution_notification_controller_unittest.cc b/ash/display/resolution_notification_controller_unittest.cc
index e3b2740a284d68269cdc48ab5a86eecb0da80406..afbc4a755eb9b71925aa58be6aeb86758dd66e09 100644
--- a/ash/display/resolution_notification_controller_unittest.cc
+++ b/ash/display/resolution_notification_controller_unittest.cc
@@ -157,7 +157,7 @@
if (!SupportsMultipleDisplays())
return;
- UpdateDisplay("300x300#300x300%57|200x200%58,250x250#250x250%59|200x200%60");
+ UpdateDisplay("300x300#300x300|200x200,250x250#250x250|200x200");
int64 id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
ash::internal::DisplayManager* display_manager =
ash::Shell::GetInstance()->display_manager();
@@ -171,26 +171,25 @@
EXPECT_FALSE(controller()->DoesNotificationTimeout());
EXPECT_EQ(ExpectedNotificationMessage(id2, gfx::Size(200, 200)),
GetNotificationMessage());
- DisplayMode mode;
- EXPECT_TRUE(display_manager->GetSelectedModeForDisplayId(id2, &mode));
- EXPECT_EQ("200x200", mode.size.ToString());
- EXPECT_EQ(60.0, mode.refresh_rate);
+ gfx::Size resolution;
+ EXPECT_TRUE(
+ display_manager->GetSelectedResolutionForDisplayId(id2, &resolution));
+ EXPECT_EQ("200x200", resolution.ToString());
// Click the revert button, which reverts to the best resolution.
ClickOnNotificationButton(0);
RunAllPendingInMessageLoop();
EXPECT_FALSE(IsNotificationVisible());
EXPECT_EQ(0, accept_count());
- EXPECT_TRUE(display_manager->GetSelectedModeForDisplayId(id2, &mode));
- EXPECT_EQ("250x250", mode.size.ToString());
- EXPECT_EQ(59.0, mode.refresh_rate);
+ EXPECT_FALSE(
+ display_manager->GetSelectedResolutionForDisplayId(id2, &resolution));
}
TEST_F(ResolutionNotificationControllerTest, ClickMeansAccept) {
if (!SupportsMultipleDisplays())
return;
- UpdateDisplay("300x300#300x300%57|200x200%58,250x250#250x250%59|200x200%60");
+ UpdateDisplay("300x300#300x300|200x200,250x250#250x250|200x200");
int64 id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
ash::internal::DisplayManager* display_manager =
ash::Shell::GetInstance()->display_manager();
@@ -202,19 +201,19 @@
ScreenUtil::GetSecondaryDisplay(), gfx::Size(200, 200));
EXPECT_TRUE(IsNotificationVisible());
EXPECT_FALSE(controller()->DoesNotificationTimeout());
- DisplayMode mode;
- EXPECT_TRUE(display_manager->GetSelectedModeForDisplayId(id2, &mode));
- EXPECT_EQ("200x200", mode.size.ToString());
- EXPECT_EQ(60.0, mode.refresh_rate);
+ gfx::Size resolution;
+ EXPECT_TRUE(
+ display_manager->GetSelectedResolutionForDisplayId(id2, &resolution));
+ EXPECT_EQ("200x200", resolution.ToString());
// Click the revert button, which reverts the resolution.
ClickOnNotification();
RunAllPendingInMessageLoop();
EXPECT_FALSE(IsNotificationVisible());
EXPECT_EQ(1, accept_count());
- EXPECT_TRUE(display_manager->GetSelectedModeForDisplayId(id2, &mode));
- EXPECT_EQ("200x200", mode.size.ToString());
- EXPECT_EQ(60.0, mode.refresh_rate);
+ EXPECT_TRUE(
+ display_manager->GetSelectedResolutionForDisplayId(id2, &resolution));
+ EXPECT_EQ("200x200", resolution.ToString());
}
TEST_F(ResolutionNotificationControllerTest, AcceptButton) {
@@ -224,7 +223,7 @@
ash::internal::DisplayManager* display_manager =
ash::Shell::GetInstance()->display_manager();
- UpdateDisplay("300x300#300x300%59|200x200%60");
+ UpdateDisplay("300x300#300x300|200x200");
const gfx::Display& display = ash::Shell::GetScreen()->GetPrimaryDisplay();
SetDisplayResolutionAndNotify(display, gfx::Size(200, 200));
EXPECT_TRUE(IsNotificationVisible());
@@ -235,14 +234,13 @@
ClickOnNotificationButton(0);
EXPECT_FALSE(IsNotificationVisible());
EXPECT_EQ(1, accept_count());
- DisplayMode mode;
- EXPECT_TRUE(
- display_manager->GetSelectedModeForDisplayId(display.id(), &mode));
- EXPECT_EQ("200x200", mode.size.ToString());
- EXPECT_EQ(60.0f, mode.refresh_rate);
+ gfx::Size resolution;
+ EXPECT_TRUE(display_manager->GetSelectedResolutionForDisplayId(
+ display.id(), &resolution));
+ EXPECT_EQ("200x200", resolution.ToString());
// In that case the second button is revert.
- UpdateDisplay("300x300#300x300%59|200x200%60");
+ UpdateDisplay("300x300#300x300|200x200");
SetDisplayResolutionAndNotify(display, gfx::Size(200, 200));
EXPECT_TRUE(IsNotificationVisible());
@@ -250,17 +248,15 @@
ClickOnNotificationButton(1);
EXPECT_FALSE(IsNotificationVisible());
EXPECT_EQ(1, accept_count());
- EXPECT_TRUE(
- display_manager->GetSelectedModeForDisplayId(display.id(), &mode));
- EXPECT_EQ("300x300", mode.size.ToString());
- EXPECT_EQ(59.0f, mode.refresh_rate);
+ EXPECT_FALSE(display_manager->GetSelectedResolutionForDisplayId(
+ display.id(), &resolution));
}
TEST_F(ResolutionNotificationControllerTest, Close) {
if (!SupportsMultipleDisplays())
return;
- UpdateDisplay("100x100,150x150#150x150%59|200x200%60");
+ UpdateDisplay("100x100,150x150#150x150|200x200");
int64 id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
ash::internal::DisplayManager* display_manager =
ash::Shell::GetInstance()->display_manager();
@@ -272,10 +268,10 @@
ScreenUtil::GetSecondaryDisplay(), gfx::Size(200, 200));
EXPECT_TRUE(IsNotificationVisible());
EXPECT_FALSE(controller()->DoesNotificationTimeout());
- DisplayMode mode;
- EXPECT_TRUE(display_manager->GetSelectedModeForDisplayId(id2, &mode));
- EXPECT_EQ("200x200", mode.size.ToString());
- EXPECT_EQ(60.0f, mode.refresh_rate);
+ gfx::Size resolution;
+ EXPECT_TRUE(
+ display_manager->GetSelectedResolutionForDisplayId(id2, &resolution));
+ EXPECT_EQ("200x200", resolution.ToString());
// Close the notification (imitates clicking [x] button). Also verifies if
// this does not cause a crash. See crbug.com/271784
@@ -289,7 +285,7 @@
if (!SupportsMultipleDisplays())
return;
- UpdateDisplay("300x300#300x300%59|200x200%60");
+ UpdateDisplay("300x300#300x300|200x200");
const gfx::Display& display = ash::Shell::GetScreen()->GetPrimaryDisplay();
SetDisplayResolutionAndNotify(display, gfx::Size(200, 200));
@@ -301,21 +297,18 @@
}
EXPECT_FALSE(IsNotificationVisible());
EXPECT_EQ(0, accept_count());
- ash::internal::DisplayManager* display_manager =
- ash::Shell::GetInstance()->display_manager();
- DisplayMode mode;
- EXPECT_TRUE(
- display_manager->GetSelectedModeForDisplayId(display.id(), &mode));
- EXPECT_EQ("300x300", mode.size.ToString());
- EXPECT_EQ(59.0f, mode.refresh_rate);
+ gfx::Size resolution;
+ ash::internal::DisplayManager* display_manager =
+ ash::Shell::GetInstance()->display_manager();
+ EXPECT_FALSE(display_manager->GetSelectedResolutionForDisplayId(
+ display.id(), &resolution));
}
TEST_F(ResolutionNotificationControllerTest, DisplayDisconnected) {
if (!SupportsMultipleDisplays())
return;
- UpdateDisplay("300x300#300x300%56|200x200%57,"
- "200x200#250x250%58|200x200%59|100x100%60");
+ UpdateDisplay("300x300#300x300|200x200,200x200#250x250|200x200|100x100");
int64 id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
ash::internal::DisplayManager* display_manager =
ash::Shell::GetInstance()->display_manager();
@@ -324,23 +317,21 @@
ASSERT_TRUE(IsNotificationVisible());
// Disconnects the secondary display and verifies it doesn't cause crashes.
- UpdateDisplay("300x300#300x300%56|200x200%57");
+ UpdateDisplay("300x300#300x300|200x200");
RunAllPendingInMessageLoop();
EXPECT_FALSE(IsNotificationVisible());
EXPECT_EQ(0, accept_count());
- DisplayMode mode;
- EXPECT_TRUE(display_manager->GetSelectedModeForDisplayId(id2, &mode));
- gfx::Size resolution;
- EXPECT_EQ("200x200", mode.size.ToString());
- EXPECT_EQ(59.0f, mode.refresh_rate);
+ gfx::Size resolution;
+ EXPECT_TRUE(
+ display_manager->GetSelectedResolutionForDisplayId(id2, &resolution));
+ EXPECT_EQ("200x200", resolution.ToString());
}
TEST_F(ResolutionNotificationControllerTest, MultipleResolutionChange) {
if (!SupportsMultipleDisplays())
return;
- UpdateDisplay("300x300#300x300%56|200x200%57,"
- "250x250#250x250%58|200x200%59");
+ UpdateDisplay("300x300#300x300|200x200,250x250#250x250|200x200");
int64 id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
ash::internal::DisplayManager* display_manager =
ash::Shell::GetInstance()->display_manager();
@@ -349,37 +340,34 @@
ScreenUtil::GetSecondaryDisplay(), gfx::Size(200, 200));
EXPECT_TRUE(IsNotificationVisible());
EXPECT_FALSE(controller()->DoesNotificationTimeout());
- DisplayMode mode;
- EXPECT_TRUE(display_manager->GetSelectedModeForDisplayId(id2, &mode));
- EXPECT_EQ("200x200", mode.size.ToString());
- EXPECT_EQ(59.0f, mode.refresh_rate);
+ gfx::Size resolution;
+ EXPECT_TRUE(
+ display_manager->GetSelectedResolutionForDisplayId(id2, &resolution));
+ EXPECT_EQ("200x200", resolution.ToString());
// Invokes SetDisplayResolutionAndNotify during the previous notification is
// visible.
SetDisplayResolutionAndNotify(
ScreenUtil::GetSecondaryDisplay(), gfx::Size(250, 250));
- EXPECT_TRUE(display_manager->GetSelectedModeForDisplayId(id2, &mode));
- EXPECT_EQ("250x250", mode.size.ToString());
- EXPECT_EQ(58.0f, mode.refresh_rate);
+ EXPECT_FALSE(
+ display_manager->GetSelectedResolutionForDisplayId(id2, &resolution));
// Then, click the revert button. Although |old_resolution| for the second
// SetDisplayResolutionAndNotify is 200x200, it should revert to the original
- // size 250x250.
+ // size 150x150.
ClickOnNotificationButton(0);
RunAllPendingInMessageLoop();
EXPECT_FALSE(IsNotificationVisible());
EXPECT_EQ(0, accept_count());
- EXPECT_TRUE(display_manager->GetSelectedModeForDisplayId(id2, &mode));
- EXPECT_EQ("250x250", mode.size.ToString());
- EXPECT_EQ(58.0f, mode.refresh_rate);
+ EXPECT_FALSE(
+ display_manager->GetSelectedResolutionForDisplayId(id2, &resolution));
}
TEST_F(ResolutionNotificationControllerTest, Fallback) {
if (!SupportsMultipleDisplays())
return;
- UpdateDisplay("300x300#300x300%56|200x200%57,"
- "250x250#250x250%58|220x220%59|200x200%60");
+ UpdateDisplay("300x300#300x300|200x200,250x250#250x250|220x220|200x200");
int64 id2 = ash::ScreenUtil::GetSecondaryDisplay().id();
ash::internal::DisplayManager* display_manager =
ash::Shell::GetInstance()->display_manager();
@@ -397,19 +385,18 @@
ExpectedFallbackNotificationMessage(
id2, gfx::Size(220, 220), gfx::Size(200, 200)),
GetNotificationMessage());
- DisplayMode mode;
- EXPECT_TRUE(display_manager->GetSelectedModeForDisplayId(id2, &mode));
- EXPECT_EQ("200x200", mode.size.ToString());
- EXPECT_EQ(60.0f, mode.refresh_rate);
+ gfx::Size resolution;
+ EXPECT_TRUE(
+ display_manager->GetSelectedResolutionForDisplayId(id2, &resolution));
+ EXPECT_EQ("200x200", resolution.ToString());
// Click the revert button, which reverts to the best resolution.
ClickOnNotificationButton(0);
RunAllPendingInMessageLoop();
EXPECT_FALSE(IsNotificationVisible());
EXPECT_EQ(0, accept_count());
- EXPECT_TRUE(display_manager->GetSelectedModeForDisplayId(id2, &mode));
- EXPECT_EQ("250x250", mode.size.ToString());
- EXPECT_EQ(58.0f, mode.refresh_rate);
+ EXPECT_FALSE(
+ display_manager->GetSelectedResolutionForDisplayId(id2, &resolution));
}
} // namespace internal
« no previous file with comments | « ash/display/display_manager_unittest.cc ('k') | ash/wm/window_animations.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698