| Index: cc/CCLayerTreeHost.cpp
|
| diff --git a/cc/CCLayerTreeHost.cpp b/cc/CCLayerTreeHost.cpp
|
| index a63bfe76f70e0e3d15f65d9240cb3cf29e0de29e..18de85ba41c5052fcb8a4d3222133058c10df1ba 100644
|
| --- a/cc/CCLayerTreeHost.cpp
|
| +++ b/cc/CCLayerTreeHost.cpp
|
| @@ -233,7 +233,7 @@ void CCLayerTreeHost::updateAnimations(double monotonicFrameBeginTime)
|
| animateLayers(monotonicFrameBeginTime);
|
| m_animating = false;
|
|
|
| - m_renderingStats.numAnimationFrames++;
|
| + m_renderingStats.mainAnimationFrameCount++;
|
| }
|
|
|
| void CCLayerTreeHost::layout()
|
| @@ -817,7 +817,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);
|
| }
|
|
|
| @@ -838,7 +838,6 @@ bool CCLayerTreeHost::animateLayersRecursive(LayerChromium* current, double mono
|
| if (animateLayersRecursive(current->children()[i].get(), monotonicTime))
|
| subtreeNeedsAnimateLayers = true;
|
| }
|
| -
|
| return subtreeNeedsAnimateLayers;
|
| }
|
|
|
|
|