Index: cc/layer_tree_host.cc |
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc |
index 008e251bf33cb05a299c1bd7f3708819c2c591ba..d834164d80e1eea77f66df49b4371272649f5371 100644 |
--- a/cc/layer_tree_host.cc |
+++ b/cc/layer_tree_host.cc |
@@ -218,11 +218,11 @@ void LayerTreeHost::didBeginFrame() |
m_client->didBeginFrame(); |
} |
-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++; |
@@ -821,18 +821,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) |