| Index: cc/trees/layer_tree_host.cc
|
| diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
|
| index d9cab33cef74c5932c7ae035a5f2fed42b163382..e284014839b08557ef01699697689786ce903abf 100644
|
| --- a/cc/trees/layer_tree_host.cc
|
| +++ b/cc/trees/layer_tree_host.cc
|
| @@ -1150,15 +1150,13 @@ scoped_ptr<base::Value> LayerTreeHost::AsValue() const {
|
| return state.PassAs<base::Value>();
|
| }
|
|
|
| -void LayerTreeHost::AnimateLayers(base::TimeTicks time) {
|
| +void LayerTreeHost::AnimateLayers(base::TimeTicks monotonic_time) {
|
| if (!settings_.accelerated_animation_enabled ||
|
| animation_registrar_->active_animation_controllers().empty())
|
| return;
|
|
|
| TRACE_EVENT0("cc", "LayerTreeHost::AnimateLayers");
|
|
|
| - double monotonic_time = (time - base::TimeTicks()).InSecondsF();
|
| -
|
| AnimationRegistrar::AnimationControllerMap copy =
|
| animation_registrar_->active_animation_controllers();
|
| for (AnimationRegistrar::AnimationControllerMap::iterator iter = copy.begin();
|
|
|