cc: Improve frame/commit accounting

cc/rendering_stats.h

Index: cc/rendering_stats.h
diff --git a/cc/rendering_stats.h b/cc/rendering_stats.h
index fb178a89722fe38fb7fd69a483c6023b305e44c1..8cf6bedff15f2ed24eb8931313a5c10a403d9b51 100644
--- a/cc/rendering_stats.h
+++ b/cc/rendering_stats.h
@@ -8,27 +8,30 @@
 namespace cc {
 
 struct CCRenderingStats {
-    // FIXME: Rename these to animationFrameCount and screenFrameCount, crbug.com/138641.
-    int numAnimationFrames;
-    int numFramesSentToScreen;
-    int droppedFrameCount;
+    int64_t vsyncCount;
+    int64_t rendererFrameCount;
+    int64_t mainAnimationFrameCount;
+    int64_t implAnimationFrameCount;
+    int64_t droppedFrameCount;
     double totalPaintTimeInSeconds;
     double totalRasterizeTimeInSeconds;
     double totalCommitTimeInSeconds;
-    size_t totalCommitCount;
-    size_t numImplThreadScrolls;
-    size_t numMainThreadScrolls;
+    int64_t totalCommitCount;
+    int64_t implThreadScrollCount;
+    int64_t mainThreadScrollCount;
 
     CCRenderingStats()
-        : numAnimationFrames(0)
-        , numFramesSentToScreen(0)
+        : vsyncCount(0)
+        , rendererFrameCount(0)
+        , mainAnimationFrameCount(0)
+        , implAnimationFrameCount(0)
         , droppedFrameCount(0)
         , totalPaintTimeInSeconds(0)
         , totalRasterizeTimeInSeconds(0)
         , totalCommitTimeInSeconds(0)
         , totalCommitCount(0)
-        , numImplThreadScrolls(0)
-        , numMainThreadScrolls(0)
+        , implThreadScrollCount(0)
+        , mainThreadScrollCount(0)
     {
     }
 };