diff options
| author | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-03 06:10:41 +0000 |
|---|---|---|
| committer | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-03 06:10:41 +0000 |
| commit | e5745ed3b31afe15a491be1116ab6fc6556cf649 (patch) | |
| tree | 1f3839eb38d886ddbc4e8682bb0359db79026d06 /ash/wm/workspace_controller_unittest.cc | |
| parent | 8dbcf0de0787507c255f15c4d47bbda86fd35f1b (diff) | |
| download | chromium_src-e5745ed3b31afe15a491be1116ab6fc6556cf649.zip chromium_src-e5745ed3b31afe15a491be1116ab6fc6556cf649.tar.gz chromium_src-e5745ed3b31afe15a491be1116ab6fc6556cf649.tar.bz2 | |
Revert r274404 and r274409:
"compositor: Tick the UI animations from cc, instead of from timer callbacks."
"asan: Fix asan leak from r274404."
These CLs seem to break ash_unittests on win8 aura bot:
http://build.chromium.org/p/chromium.win/buildstatus?builder=Win8%20Aura&number=19390
BUG=371071
TBR=sadrul@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/311783002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/workspace_controller_unittest.cc')
| -rw-r--r-- | ash/wm/workspace_controller_unittest.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc index 0504a4b..fcfa414 100644 --- a/ash/wm/workspace_controller_unittest.cc +++ b/ash/wm/workspace_controller_unittest.cc @@ -31,7 +31,6 @@ #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" @@ -1237,12 +1236,6 @@ 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 |