| Index: webkit/compositor_bindings/web_layer_tree_view_impl.cc
|
| diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
|
| index 4ff7b0d566dc6be2eab591f5a2489f9b2264bea9..47ab02e9c0a88da670919797c73fec049c2e8622 100644
|
| --- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc
|
| +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
|
| @@ -172,10 +172,11 @@ void WebLayerTreeViewImpl::composite()
|
| m_layerTreeHost->composite();
|
| }
|
|
|
| -void WebLayerTreeViewImpl::updateAnimations(double frameBeginTimeSeconds)
|
| +void WebLayerTreeViewImpl::updateAnimations(double monotonicFrameBeginTimeSeconds, double wallClockFrameBeginTimeSeconds)
|
| {
|
| - base::TimeTicks frameBeginTime = base::TimeTicks::FromInternalValue(frameBeginTimeSeconds * base::Time::kMicrosecondsPerSecond);
|
| - m_layerTreeHost->updateAnimations(frameBeginTime);
|
| + base::TimeTicks monotonicFrameBeginTime = base::TimeTicks::FromInternalValue(monotonicFrameBeginTimeSeconds * base::Time::kMicrosecondsPerSecond);
|
| + base::Time wallClockFrameBeginTime = base::Time::FromDoubleT(wallClockFrameBeginTimeSeconds);
|
| + m_layerTreeHost->updateAnimations(monotonicFrameBeginTime, wallClockFrameBeginTime);
|
| }
|
|
|
| void WebLayerTreeViewImpl::didStopFlinging()
|
| @@ -198,6 +199,12 @@ void WebLayerTreeViewImpl::setDeferCommits(bool deferCommits)
|
| m_layerTreeHost->setDeferCommits(deferCommits);
|
| }
|
|
|
| +void WebLayerTreeViewImpl::registerForAnimations(WebLayer* layer)
|
| +{
|
| + cc::Layer* ccLayer = static_cast<WebLayerImpl*>(layer)->layer();
|
| + ccLayer->layerAnimationController()->setAnimationRegistrar(m_layerTreeHost->animationRegistrar());
|
| +}
|
| +
|
| void WebLayerTreeViewImpl::renderingStats(WebRenderingStats& stats) const
|
| {
|
| m_layerTreeHost->renderingStats(
|
| @@ -225,6 +232,11 @@ void WebLayerTreeViewImpl::setContinuousPaintingEnabled(bool enabled)
|
| m_layerTreeHost->setDebugState(debugState);
|
| }
|
|
|
| +void WebLayerTreeViewImpl::didUpdateLayout()
|
| +{
|
| + m_layerTreeHost->didUpdateLayout();
|
| +}
|
| +
|
| scoped_ptr<FontAtlas> WebLayerTreeViewImpl::createFontAtlas()
|
| {
|
| int fontHeight;
|
|
|