| Index: ui/ozone/platform/dri/screen_manager_unittest.cc
|
| diff --git a/ui/ozone/platform/dri/screen_manager_unittest.cc b/ui/ozone/platform/dri/screen_manager_unittest.cc
|
| index 1ee000602413795b56ccbc0e8242f7e560964473..3851a7dd6970d41e5b978ceaeac5dd8e34e028cd 100644
|
| --- a/ui/ozone/platform/dri/screen_manager_unittest.cc
|
| +++ b/ui/ozone/platform/dri/screen_manager_unittest.cc
|
| @@ -75,8 +75,8 @@ TEST_F(ScreenManagerTest, CheckWithNoControllers) {
|
| }
|
|
|
| TEST_F(ScreenManagerTest, CheckWithValidController) {
|
| - screen_manager_->AddDisplayController(
|
| - dri_.get(), kPrimaryCrtc, kPrimaryConnector);
|
| + screen_manager_->AddDisplayController(dri_.get(), kPrimaryCrtc,
|
| + kPrimaryConnector);
|
| screen_manager_->ConfigureDisplayController(kPrimaryCrtc,
|
| kPrimaryConnector,
|
| GetPrimaryBounds().origin(),
|
| @@ -89,8 +89,8 @@ TEST_F(ScreenManagerTest, CheckWithValidController) {
|
| }
|
|
|
| TEST_F(ScreenManagerTest, CheckWithInvalidBounds) {
|
| - screen_manager_->AddDisplayController(
|
| - dri_.get(), kPrimaryCrtc, kPrimaryConnector);
|
| + screen_manager_->AddDisplayController(dri_.get(), kPrimaryCrtc,
|
| + kPrimaryConnector);
|
| screen_manager_->ConfigureDisplayController(kPrimaryCrtc,
|
| kPrimaryConnector,
|
| GetPrimaryBounds().origin(),
|
| @@ -101,26 +101,25 @@ TEST_F(ScreenManagerTest, CheckWithInvalidBounds) {
|
| }
|
|
|
| TEST_F(ScreenManagerTest, CheckForSecondValidController) {
|
| - screen_manager_->AddDisplayController(
|
| - dri_.get(), kPrimaryCrtc, kPrimaryConnector);
|
| + screen_manager_->AddDisplayController(dri_.get(), kPrimaryCrtc,
|
| + kPrimaryConnector);
|
| screen_manager_->ConfigureDisplayController(kPrimaryCrtc,
|
| kPrimaryConnector,
|
| GetPrimaryBounds().origin(),
|
| kDefaultMode);
|
| - screen_manager_->AddDisplayController(
|
| - dri_.get(), kSecondaryCrtc, kSecondaryConnector);
|
| - screen_manager_->ConfigureDisplayController(kSecondaryCrtc,
|
| - kSecondaryConnector,
|
| - GetSecondaryBounds().origin(),
|
| - kDefaultMode);
|
| + screen_manager_->AddDisplayController(dri_.get(), kSecondaryCrtc,
|
| + kSecondaryConnector);
|
| + screen_manager_->ConfigureDisplayController(
|
| + kSecondaryCrtc, kSecondaryConnector, GetSecondaryBounds().origin(),
|
| + kDefaultMode);
|
|
|
| EXPECT_TRUE(screen_manager_->GetDisplayController(GetPrimaryBounds()));
|
| EXPECT_TRUE(screen_manager_->GetDisplayController(GetSecondaryBounds()));
|
| }
|
|
|
| TEST_F(ScreenManagerTest, CheckControllerAfterItIsRemoved) {
|
| - screen_manager_->AddDisplayController(
|
| - dri_.get(), kPrimaryCrtc, kPrimaryConnector);
|
| + screen_manager_->AddDisplayController(dri_.get(), kPrimaryCrtc,
|
| + kPrimaryConnector);
|
| screen_manager_->ConfigureDisplayController(kPrimaryCrtc,
|
| kPrimaryConnector,
|
| GetPrimaryBounds().origin(),
|
| @@ -134,8 +133,8 @@ TEST_F(ScreenManagerTest, CheckControllerAfterItIsRemoved) {
|
| }
|
|
|
| TEST_F(ScreenManagerTest, CheckDuplicateConfiguration) {
|
| - screen_manager_->AddDisplayController(
|
| - dri_.get(), kPrimaryCrtc, kPrimaryConnector);
|
| + screen_manager_->AddDisplayController(dri_.get(), kPrimaryCrtc,
|
| + kPrimaryConnector);
|
| screen_manager_->ConfigureDisplayController(kPrimaryCrtc,
|
| kPrimaryConnector,
|
| GetPrimaryBounds().origin(),
|
| @@ -150,8 +149,8 @@ TEST_F(ScreenManagerTest, CheckDuplicateConfiguration) {
|
| }
|
|
|
| TEST_F(ScreenManagerTest, CheckChangingMode) {
|
| - screen_manager_->AddDisplayController(
|
| - dri_.get(), kPrimaryCrtc, kPrimaryConnector);
|
| + screen_manager_->AddDisplayController(dri_.get(), kPrimaryCrtc,
|
| + kPrimaryConnector);
|
| screen_manager_->ConfigureDisplayController(kPrimaryCrtc,
|
| kPrimaryConnector,
|
| GetPrimaryBounds().origin(),
|
| @@ -171,14 +170,14 @@ TEST_F(ScreenManagerTest, CheckChangingMode) {
|
| }
|
|
|
| TEST_F(ScreenManagerTest, CheckForControllersInMirroredMode) {
|
| - screen_manager_->AddDisplayController(
|
| - dri_.get(), kPrimaryCrtc, kPrimaryConnector);
|
| + screen_manager_->AddDisplayController(dri_.get(), kPrimaryCrtc,
|
| + kPrimaryConnector);
|
| screen_manager_->ConfigureDisplayController(kPrimaryCrtc,
|
| kPrimaryConnector,
|
| GetPrimaryBounds().origin(),
|
| kDefaultMode);
|
| - screen_manager_->AddDisplayController(
|
| - dri_.get(), kSecondaryCrtc, kSecondaryConnector);
|
| + screen_manager_->AddDisplayController(dri_.get(), kSecondaryCrtc,
|
| + kSecondaryConnector);
|
| screen_manager_->ConfigureDisplayController(kSecondaryCrtc,
|
| kSecondaryConnector,
|
| GetPrimaryBounds().origin(),
|
| @@ -189,14 +188,14 @@ TEST_F(ScreenManagerTest, CheckForControllersInMirroredMode) {
|
| }
|
|
|
| TEST_F(ScreenManagerTest, CheckMirrorModeTransitions) {
|
| - screen_manager_->AddDisplayController(
|
| - dri_.get(), kPrimaryCrtc, kPrimaryConnector);
|
| + screen_manager_->AddDisplayController(dri_.get(), kPrimaryCrtc,
|
| + kPrimaryConnector);
|
| screen_manager_->ConfigureDisplayController(kPrimaryCrtc,
|
| kPrimaryConnector,
|
| GetPrimaryBounds().origin(),
|
| kDefaultMode);
|
| - screen_manager_->AddDisplayController(
|
| - dri_.get(), kSecondaryCrtc, kSecondaryConnector);
|
| + screen_manager_->AddDisplayController(dri_.get(), kSecondaryCrtc,
|
| + kSecondaryConnector);
|
| screen_manager_->ConfigureDisplayController(kSecondaryCrtc,
|
| kSecondaryConnector,
|
| GetSecondaryBounds().origin(),
|
| @@ -229,14 +228,14 @@ TEST_F(ScreenManagerTest, CheckMirrorModeTransitions) {
|
| }
|
|
|
| TEST_F(ScreenManagerTest, MonitorGoneInMirrorMode) {
|
| - screen_manager_->AddDisplayController(
|
| - dri_.get(), kPrimaryCrtc, kPrimaryConnector);
|
| + screen_manager_->AddDisplayController(dri_.get(), kPrimaryCrtc,
|
| + kPrimaryConnector);
|
| screen_manager_->ConfigureDisplayController(kPrimaryCrtc,
|
| kPrimaryConnector,
|
| GetPrimaryBounds().origin(),
|
| kDefaultMode);
|
| - screen_manager_->AddDisplayController(
|
| - dri_.get(), kSecondaryCrtc, kSecondaryConnector);
|
| + screen_manager_->AddDisplayController(dri_.get(), kSecondaryCrtc,
|
| + kSecondaryConnector);
|
| screen_manager_->ConfigureDisplayController(kSecondaryCrtc,
|
| kSecondaryConnector,
|
| GetPrimaryBounds().origin(),
|
|
|