cc: Improve frame/commit accounting

cc/CCFrameRateController.h

Index: cc/CCFrameRateController.h
diff --git a/cc/CCFrameRateController.h b/cc/CCFrameRateController.h
index 2ad0da66ea98b294746f2b0d74b51220bb3710a7..f509542d726659cd8a9cfa1cd88a815d3ca41293 100644
--- a/cc/CCFrameRateController.h
+++ b/cc/CCFrameRateController.h
@@ -13,6 +13,7 @@
 
 namespace cc {
 
+class CCRenderingStats;
 class CCThread;
 class CCTimeSource;
 
@@ -36,7 +37,7 @@ public:
 
     void setClient(CCFrameRateControllerClient* client) { m_client = client; }
 
-    void setActive(bool);
+    void setActive(bool drawActive, bool commitActive);
 
     // Use the following methods to adjust target frame rate.
     //
@@ -55,6 +56,8 @@ public:
     void setTimebaseAndInterval(base::TimeTicks timebase, base::TimeDelta interval);
     void setSwapBuffersCompleteSupported(bool);
 
+    void renderingStats(CCRenderingStats* stats) const;
+
 protected:
     friend class CCFrameRateControllerTimeSourceAdapter;
     void onTimerTick();
@@ -70,8 +73,17 @@ protected:
     RefPtr<CCTimeSource> m_timeSource;
     OwnPtr<CCFrameRateControllerTimeSourceAdapter> m_timeSourceClientAdapter;
     bool m_active;
+    bool m_drawActive;
+    bool m_commitActive;
     bool m_swapBuffersCompleteSupported;
 
+    size_t m_numCsyncs;
+    size_t m_numActiveCsyncs;
+    size_t m_numBeginFrames;
+    base::TimeTicks m_activeTimestamp;
+    base::TimeTicks m_intervalChangedTime;
+    base::TimeDelta m_interval;
+
     // Members for unthrottled frame-rate.
     bool m_isTimeSourceThrottling;
     OwnPtr<CCTimer> m_manualTicker;