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 /ui/keyboard | |
| 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 'ui/keyboard')
| -rw-r--r-- | ui/keyboard/keyboard_controller_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/keyboard/keyboard_controller_unittest.cc b/ui/keyboard/keyboard_controller_unittest.cc index 52a98bd..f264493 100644 --- a/ui/keyboard/keyboard_controller_unittest.cc +++ b/ui/keyboard/keyboard_controller_unittest.cc @@ -41,13 +41,13 @@ void RunAnimationForLayer(ui::Layer* layer) { ui::ScopedAnimationDurationScaleMode::ZERO_DURATION); ui::LayerAnimatorTestController controller(layer->GetAnimator()); + gfx::AnimationContainerElement* element = layer->GetAnimator(); // Multiple steps are required to complete complex animations. // TODO(vollick): This should not be necessary. crbug.com/154017 while (controller.animator()->is_animating()) { controller.StartThreadedAnimationsIfNeeded(); base::TimeTicks step_time = controller.animator()->last_step_time(); - controller.animator()->Step(step_time + - base::TimeDelta::FromMilliseconds(1000)); + element->Step(step_time + base::TimeDelta::FromMilliseconds(1000)); } } |