cc: Improve frame/commit accounting

cc/CCLayerTreeHostImpl.cpp

Index: cc/CCLayerTreeHostImpl.cpp
diff --git a/cc/CCLayerTreeHostImpl.cpp b/cc/CCLayerTreeHostImpl.cpp
index 5b1a23d67c4849142e87a75153fb473335e1f628..e7a0dc06acaee4e4f07b941932c5fec73b1d6e55 100644
--- a/cc/CCLayerTreeHostImpl.cpp
+++ b/cc/CCLayerTreeHostImpl.cpp
@@ -129,10 +129,11 @@ CCLayerTreeHostImpl::CCLayerTreeHostImpl(const CCLayerTreeSettings& settings, CC
     , m_hasTransparentBackground(false)
     , m_needsAnimateLayers(false)
     , m_pinchGestureActive(false)
+    , m_animationFrameCount(0)
     , m_fpsCounter(CCFrameRateCounter::create())
     , m_debugRectHistory(CCDebugRectHistory::create())
-    , m_numImplThreadScrolls(0)
-    , m_numMainThreadScrolls(0)
+    , m_implThreadScrollCount(0)
+    , m_mainThreadScrollCount(0)
 {
     ASSERT(CCProxy::isImplThread());
     didVisibilityChange(this, m_visible);
@@ -928,7 +929,7 @@ CCInputHandlerClient::ScrollStatus CCLayerTreeHostImpl::scrollBegin(const IntPoi
     for (; layerImpl; layerImpl = layerImpl->parent()) {
         // The content layer can also block attempts to scroll outside the main thread.
         if (layerImpl->tryScroll(deviceViewportPoint, type) == ScrollOnMainThread) {
-            m_numMainThreadScrolls++;
+            m_mainThreadScrollCount++;
             return ScrollOnMainThread;
         }
 
@@ -940,7 +941,7 @@ CCInputHandlerClient::ScrollStatus CCLayerTreeHostImpl::scrollBegin(const IntPoi
 
         // If any layer wants to divert the scroll event to the main thread, abort.
         if (status == ScrollOnMainThread) {
-            m_numMainThreadScrolls++;
+            m_mainThreadScrollCount++;
             return ScrollOnMainThread;
         }
 
@@ -954,7 +955,7 @@ CCInputHandlerClient::ScrollStatus CCLayerTreeHostImpl::scrollBegin(const IntPoi
         // so that the scrolling contents exactly follow the user's finger. In contrast, wheel
         // events are already in local layer coordinates so we can just apply them directly.
         m_scrollDeltaIsInScreenSpace = (type == Gesture);
-        m_numImplThreadScrolls++;
+        m_implThreadScrollCount++;
         return ScrollStarted;
     }
     return ScrollIgnored;
@@ -1230,6 +1231,7 @@ void CCLayerTreeHostImpl::animateLayers(double monotonicTime, double wallClockTi
     if (!CCSettings::acceleratedAnimationEnabled() || !m_needsAnimateLayers || !m_rootLayerImpl)
         return;
 
+    m_animationFrameCount++;
     TRACE_EVENT0("cc", "CCLayerTreeHostImpl::animateLayers");
 
     OwnPtr<CCAnimationEventsVector> events(adoptPtr(new CCAnimationEventsVector));
@@ -1304,10 +1306,10 @@ int CCLayerTreeHostImpl::sourceAnimationFrameNumber() const
 
 void CCLayerTreeHostImpl::renderingStats(CCRenderingStats* stats) const
 {
-    stats->numFramesSentToScreen = fpsCounter()->currentFrameNumber();
-    stats->droppedFrameCount = fpsCounter()->droppedFrameCount();
-    stats->numImplThreadScrolls = m_numImplThreadScrolls;
-    stats->numMainThreadScrolls = m_numMainThreadScrolls;
+    stats->compositorFrameCount = fpsCounter()->currentFrameNumber();
+    stats->implThreadScrollCount = m_implThreadScrollCount;
+    stats->mainThreadScrollCount = m_mainThreadScrollCount;
+    stats->implAnimationFrameCount = m_animationFrameCount;
 }
 
 void CCLayerTreeHostImpl::animateScrollbars(double monotonicTime)