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

Unified Diff: ash/display/display_configuration_controller_unittest.cc

Issue 2910413002: cros: Do not cache |root_window| in ScreenRotationAnimator. (Closed)
Patch Set: Tie ScreenRotationAnimator to |root_window|. Created 3 years, 7 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
Index: ash/display/display_configuration_controller_unittest.cc
diff --git a/ash/display/display_configuration_controller_unittest.cc b/ash/display/display_configuration_controller_unittest.cc
index 6b99ad2f02ec907984f840b9362e1d8594ad6374..fb132ef02872282279070c17988170fb5456b6e7 100644
--- a/ash/display/display_configuration_controller_unittest.cc
+++ b/ash/display/display_configuration_controller_unittest.cc
@@ -23,24 +23,22 @@ TEST_F(DisplayConfigurationControllerTest, OnlyHasOneAnimator) {
display::Display display = display::Screen::GetScreen()->GetPrimaryDisplay();
test::DisplayConfigurationControllerTestApi testapi(
Shell::Get()->display_configuration_controller());
- ScreenRotationAnimator* screen_rotation_animator =
+ ScreenRotationAnimator* old_screen_rotation_animator =
testapi.GetScreenRotationAnimatorForDisplay(display.id());
- EXPECT_EQ(1, testapi.DisplayScreenRotationAnimatorMapSize());
Shell::Get()->display_manager()->SetDisplayRotation(
display.id(), display::Display::ROTATE_0,
display::Display::RotationSource::ROTATION_SOURCE_USER);
- screen_rotation_animator->Rotate(
- display::Display::ROTATE_90,
+ old_screen_rotation_animator->Rotate(
+ display.id(), display::Display::ROTATE_90,
display::Display::RotationSource::ROTATION_SOURCE_USER);
- EXPECT_EQ(1, testapi.DisplayScreenRotationAnimatorMapSize());
- screen_rotation_animator =
+ ScreenRotationAnimator* new_screen_rotation_animator =
testapi.GetScreenRotationAnimatorForDisplay(display.id());
- screen_rotation_animator->Rotate(
- display::Display::ROTATE_180,
+ new_screen_rotation_animator->Rotate(
+ display.id(), display::Display::ROTATE_180,
display::Display::RotationSource::ROTATION_SOURCE_USER);
- EXPECT_EQ(1, testapi.DisplayScreenRotationAnimatorMapSize());
+ EXPECT_EQ(old_screen_rotation_animator, new_screen_rotation_animator);
}
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698