diff options
Diffstat (limited to 'ash/wm/workspace_controller_unittest.cc')
| -rw-r--r-- | ash/wm/workspace_controller_unittest.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc index fcfa414..0504a4b 100644 --- a/ash/wm/workspace_controller_unittest.cc +++ b/ash/wm/workspace_controller_unittest.cc @@ -31,6 +31,7 @@ #include "ui/base/ui_base_types.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" +#include "ui/compositor/test/draw_waiter_for_test.h" #include "ui/events/event_utils.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" @@ -1236,6 +1237,12 @@ TEST_F(WorkspaceControllerTest, AnimatedNormToMaxToNormRepositionsRemaining) { desktop_area.width() - window1->bounds().width()) + ",32 640x320", window1->bounds().ToString()); EXPECT_EQ("0,48 256x512", window2->bounds().ToString()); + + // Wait for the compositor to draw, which would terminate the pending + // animations. + ui::Compositor* compositor = window2->layer()->GetCompositor(); + while (compositor->layer_animator_collection()->HasActiveAnimators()) + ui::DrawWaiterForTest::Wait(compositor); } // This tests simulates a browser and an app and verifies the ordering of the |