Add duration estimation data to RenderingStats.

cc/debug/rendering_stats.cc

Index: cc/debug/rendering_stats.cc
diff --git a/cc/debug/rendering_stats.cc b/cc/debug/rendering_stats.cc
index 3e123b667c774656f88f421225e5f1963ad64f69..47bc7c7d1556d3e47f352e99af3a896336472b76 100644
--- a/cc/debug/rendering_stats.cc
+++ b/cc/debug/rendering_stats.cc
@@ -2,18 +2,43 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/values.h"
 #include "cc/debug/rendering_stats.h"
 
 namespace cc {
 
-MainThreadRenderingStats::MainThreadRenderingStats()
-    : frame_count(0),
-      painted_pixel_count(0),
-      recorded_pixel_count(0) {}
+RenderingStats::TimeDeltaList::TimeDeltaList() {
+}
+
+RenderingStats::TimeDeltaList::~TimeDeltaList() {
+}
+
+void RenderingStats::TimeDeltaList::Append(base::TimeDelta value) {
+  values.push_back(value);
+}
+
+scoped_ptr<base::ListValue>
+RenderingStats::TimeDeltaList::AsListValueInMilliseconds() const {
+  scoped_ptr<base::ListValue> list_value(new base::ListValue);
+  std::list<base::TimeDelta>::const_iterator iter;
+  for (iter = values.begin(); iter != values.end(); ++iter) {
+    list_value->AppendDouble(iter->InMillisecondsF());
+  }
+  return list_value.Pass();
+}
+
+void RenderingStats::TimeDeltaList::Add(const TimeDeltaList& other) {
+  values.insert(values.end(), other.values.begin(), other.values.end());
+}
+
+RenderingStats::MainThreadRenderingStats::MainThreadRenderingStats()
+    : frame_count(0), painted_pixel_count(0), recorded_pixel_count(0) {
+}
+
+RenderingStats::MainThreadRenderingStats::~MainThreadRenderingStats() {
+}
 
 scoped_refptr<base::debug::ConvertableToTraceFormat>
-MainThreadRenderingStats::AsTraceableData() const {
+RenderingStats::MainThreadRenderingStats::AsTraceableData() const {
   scoped_ptr<base::DictionaryValue> record_data(new base::DictionaryValue());
   record_data->SetInteger("frame_count", frame_count);
   record_data->SetDouble("paint_time", paint_time.InSecondsF());
@@ -23,7 +48,8 @@ MainThreadRenderingStats::AsTraceableData() const {
   return TracedValue::FromValue(record_data.release());
 }
 
-void MainThreadRenderingStats::Add(const MainThreadRenderingStats& other) {
+void RenderingStats::MainThreadRenderingStats::Add(
+    const MainThreadRenderingStats& other) {
   frame_count += other.frame_count;
   paint_time += other.paint_time;
   painted_pixel_count += other.painted_pixel_count;
@@ -31,15 +57,18 @@ void MainThreadRenderingStats::Add(const MainThreadRenderingStats& other) {
   recorded_pixel_count += other.recorded_pixel_count;
 }
 
-ImplThreadRenderingStats::ImplThreadRenderingStats()
+RenderingStats::ImplThreadRenderingStats::ImplThreadRenderingStats()
     : frame_count(0),
       rasterized_pixel_count(0),
       visible_content_area(0),
       approximated_visible_content_area(0) {
 }
 
+RenderingStats::ImplThreadRenderingStats::~ImplThreadRenderingStats() {
+}
+
 scoped_refptr<base::debug::ConvertableToTraceFormat>
-ImplThreadRenderingStats::AsTraceableData() const {
+RenderingStats::ImplThreadRenderingStats::AsTraceableData() const {
   scoped_ptr<base::DictionaryValue> record_data(new base::DictionaryValue());
   record_data->SetInteger("frame_count", frame_count);
   record_data->SetDouble("rasterize_time", rasterize_time.InSecondsF());
@@ -47,16 +76,47 @@ ImplThreadRenderingStats::AsTraceableData() const {
   record_data->SetInteger("visible_content_area", visible_content_area);
   record_data->SetInteger("approximated_visible_content_area",
                           approximated_visible_content_area);
+  record_data->Set("draw_duration_ms",
+                   draw_duration.AsListValueInMilliseconds().release());
+  record_data->Set(
+      "draw_duration_estimate_ms",
+      draw_duration_estimate.AsListValueInMilliseconds().release());
+  record_data->Set(
+      "begin_main_frame_to_commit_duration_ms",
+      begin_main_frame_to_commit_duration.AsListValueInMilliseconds()
+          .release());
+  record_data->Set(
+      "begin_main_frame_to_commit_duration_estimate_ms",
+      begin_main_frame_to_commit_duration_estimate.AsListValueInMilliseconds()
+          .release());
+  record_data->Set(
+      "commit_to_activate_duration_ms",
+      commit_to_activate_duration.AsListValueInMilliseconds().release());
+  record_data->Set(
+      "commit_to_activate_duration_estimate_ms",
+      commit_to_activate_duration_estimate.AsListValueInMilliseconds()
+          .release());
   return TracedValue::FromValue(record_data.release());
 }
 
-void ImplThreadRenderingStats::Add(const ImplThreadRenderingStats& other) {
+void RenderingStats::ImplThreadRenderingStats::Add(
+    const ImplThreadRenderingStats& other) {
   frame_count += other.frame_count;
   rasterize_time += other.rasterize_time;
   analysis_time += other.analysis_time;
   rasterized_pixel_count += other.rasterized_pixel_count;
   visible_content_area += other.visible_content_area;
   approximated_visible_content_area += other.approximated_visible_content_area;
+
+  draw_duration.Add(other.draw_duration);
+  draw_duration_estimate.Add(other.draw_duration_estimate);
+  begin_main_frame_to_commit_duration.Add(
+      other.begin_main_frame_to_commit_duration);
+  begin_main_frame_to_commit_duration_estimate.Add(
+      other.begin_main_frame_to_commit_duration_estimate);
+  commit_to_activate_duration.Add(other.commit_to_activate_duration);
+  commit_to_activate_duration_estimate.Add(
+      other.commit_to_activate_duration_estimate);
 }
 
 void RenderingStats::Add(const RenderingStats& other) {