cc: Improve frame/commit accounting

cc/CCLayerTreeHost.cpp

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "CCLayerTreeHost.h"
 
 #include "CCFontAtlas.h"
 #include "CCGraphicsContext.h"
@@ skipping 215 matching lines @@
     m_proxy->acquireLayerTextures();
 }
 
 void CCLayerTreeHost::updateAnimations(double monotonicFrameBeginTime)
 {
     m_animating = true;
     m_client->animate(monotonicFrameBeginTime);
     animateLayers(monotonicFrameBeginTime);
     m_animating = false;
 
-    m_renderingStats.numAnimationFrames++;
+    m_renderingStats.mainAnimationFrameCount++;
 }
 
 void CCLayerTreeHost::layout()
 {
     m_client->layout();
 }
 
 void CCLayerTreeHost::beginCommitOnImplThread(CCLayerTreeHostImpl* hostImpl)
 {
     ASSERT(CCProxy::isImplThread());
@@ skipping 563 matching lines @@
     m_deviceScaleFactor = deviceScaleFactor;
 
     setNeedsCommit();
 }
 
 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);
 }
 
 bool CCLayerTreeHost::animateLayersRecursive(LayerChromium* current, double monotonicTime)
 {
     if (!current)
         return false;
 
     bool subtreeNeedsAnimateLayers = false;
     CCLayerAnimationController* currentController = current->layerAnimationController();
     currentController->animate(monotonicTime, 0);
 
     // If the current controller still has an active animation, we must continue animating layers.
     if (currentController->hasActiveAnimation())
          subtreeNeedsAnimateLayers = true;
 
     for (size_t i = 0; i < current->children().size(); ++i) {
         if (animateLayersRecursive(current->children()[i].get(), monotonicTime))
             subtreeNeedsAnimateLayers = true;
     }
-
     return subtreeNeedsAnimateLayers;
 }
 
 void CCLayerTreeHost::setAnimationEventsRecursive(const CCAnimationEventsVector& events, LayerChromium* layer, double wallClockTime)
 {
     if (!layer)
         return;
 
     for (size_t eventIndex = 0; eventIndex < events.size(); ++eventIndex) {
         if (layer->id() == events[eventIndex].layerId) {
             if (events[eventIndex].type == CCAnimationEvent::Started)
                 layer->notifyAnimationStarted(events[eventIndex], wallClockTime);
             else
                 layer->notifyAnimationFinished(wallClockTime);
         }
     }
 
     for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIndex)
         setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime);
 }
 
 } // namespace cc