| Index: cc/layer_tree_host.cc
|
| diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
|
| index 862cccd5f084b45ee9bd25b4bb9da964a53a68ce..44833e72ec30c0458846626996c9dc5d533ce00a 100644
|
| --- a/cc/layer_tree_host.cc
|
| +++ b/cc/layer_tree_host.cc
|
| @@ -235,11 +235,11 @@ void LayerTreeHost::setNeedsDisplayOnAllLayersRecursive(Layer* layer)
|
| setNeedsDisplayOnAllLayersRecursive(layer->children()[childIndex].get());
|
| }
|
|
|
| -void LayerTreeHost::updateAnimations(base::TimeTicks frameBeginTime)
|
| +void LayerTreeHost::updateAnimations(base::TimeTicks monotonicFrameBeginTime, base::Time wallClockFrameBeginTime)
|
| {
|
| m_animating = true;
|
| - m_client->animate((frameBeginTime - base::TimeTicks()).InSecondsF());
|
| - animateLayers(frameBeginTime);
|
| + m_client->animate((monotonicFrameBeginTime - base::TimeTicks()).InSecondsF());
|
| + animateLayers(monotonicFrameBeginTime, wallClockFrameBeginTime);
|
| m_animating = false;
|
|
|
| m_renderingStats.numAnimationFrames++;
|
| @@ -858,18 +858,18 @@ void LayerTreeHost::setDeviceScaleFactor(float deviceScaleFactor)
|
| setNeedsCommit();
|
| }
|
|
|
| -void LayerTreeHost::animateLayers(base::TimeTicks time)
|
| +void LayerTreeHost::animateLayers(base::TimeTicks monotonicTime, base::Time wallClockTime)
|
| {
|
| if (!m_settings.acceleratedAnimationEnabled || m_animationRegistrar->active_animation_controllers().empty())
|
| return;
|
|
|
| TRACE_EVENT0("cc", "LayerTreeHostImpl::animateLayers");
|
|
|
| - double monotonicTime = (time - base::TimeTicks()).InSecondsF();
|
| + double monotonicTimeInSeconds = (monotonicTime - base::TimeTicks()).InSecondsF();
|
|
|
| AnimationRegistrar::AnimationControllerMap copy = m_animationRegistrar->active_animation_controllers();
|
| for (AnimationRegistrar::AnimationControllerMap::iterator iter = copy.begin(); iter != copy.end(); ++iter)
|
| - (*iter).second->animate(monotonicTime, 0);
|
| + (*iter).second->animate(monotonicTimeInSeconds, 0);
|
| }
|
|
|
| void LayerTreeHost::setAnimationEventsRecursive(const AnimationEventsVector& events, Layer* layer, base::Time wallClockTime)
|
|
|