| Index: cc/layer_tree_host.cc
|
| diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
|
| index 8d4d63b47f56d07804af7aa56f7a177aad7fba68..90f3932f91a10f47f88228896dd6862c1e15b52f 100644
|
| --- a/cc/layer_tree_host.cc
|
| +++ b/cc/layer_tree_host.cc
|
| @@ -229,7 +229,7 @@ void CCLayerTreeHost::updateAnimations(double monotonicFrameBeginTime)
|
| animateLayers(monotonicFrameBeginTime);
|
| m_animating = false;
|
|
|
| - m_renderingStats.numAnimationFrames++;
|
| + m_renderingStats.mainAnimationFrameCount++;
|
| }
|
|
|
| void CCLayerTreeHost::layout()
|
| @@ -780,7 +780,7 @@ void CCLayerTreeHost::animateLayers(double monotonicTime)
|
| if (!CCSettings::acceleratedAnimationEnabled() || !m_needsAnimateLayers)
|
| return;
|
|
|
| - TRACE_EVENT0("cc", "CCLayerTreeHostImpl::animateLayers");
|
| + TRACE_EVENT0("cc", "CCLayerTreeHost::animateLayers");
|
| m_needsAnimateLayers = animateLayersRecursive(m_rootLayer.get(), monotonicTime);
|
| }
|
|
|
| @@ -801,7 +801,6 @@ bool CCLayerTreeHost::animateLayersRecursive(LayerChromium* current, double mono
|
| if (animateLayersRecursive(current->children()[i].get(), monotonicTime))
|
| subtreeNeedsAnimateLayers = true;
|
| }
|
| -
|
| return subtreeNeedsAnimateLayers;
|
| }
|
|
|
|
|