diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 03:11:47 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 03:11:47 +0000 |
| commit | 9034a2852384f40f23305e108ee7f23ab5dc7ff3 (patch) | |
| tree | 5b2e6a7e049b39227168cbc1f2e90104897f7439 /ash/shelf | |
| parent | 71a04b9c149ecbbf096bf651f03c4803860f8334 (diff) | |
| download | chromium_src-9034a2852384f40f23305e108ee7f23ab5dc7ff3.zip chromium_src-9034a2852384f40f23305e108ee7f23ab5dc7ff3.tar.gz chromium_src-9034a2852384f40f23305e108ee7f23ab5dc7ff3.tar.bz2 | |
compositor: Tick the UI animations from cc, instead of from timer callbacks.
Update the animations in the UI in response to the animation step in the compositor,
instead of from a timer callback. This should make it more difficult for rogue UI
animations to negatively impact the system too much.
BUG=371071
R=ajuma@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/291843012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf')
| -rw-r--r-- | ash/shelf/shelf_layout_manager_unittest.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc index 3a38fc0..dd5a35d 100644 --- a/ash/shelf/shelf_layout_manager_unittest.cc +++ b/ash/shelf/shelf_layout_manager_unittest.cc @@ -34,7 +34,6 @@ #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/events/gestures/gesture_configuration.h" -#include "ui/gfx/animation/animation_container_element.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" #include "ui/views/controls/label.h" @@ -50,10 +49,8 @@ namespace ash { namespace { void StepWidgetLayerAnimatorToEnd(views::Widget* widget) { - gfx::AnimationContainerElement* element = - static_cast<gfx::AnimationContainerElement*>( - widget->GetNativeView()->layer()->GetAnimator()); - element->Step(base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1)); + widget->GetNativeView()->layer()->GetAnimator()->Step( + base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1)); } ShelfWidget* GetShelfWidget() { |