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..db2985fc5de3350ad2c056b93c7efbb40f24ce51 100644
--- a/cc/debug/rendering_stats.cc
+++ b/cc/debug/rendering_stats.cc
@@ -12,6 +12,9 @@ MainThreadRenderingStats::MainThreadRenderingStats()
       painted_pixel_count(0),
       recorded_pixel_count(0) {}
 
+MainThreadRenderingStats::~MainThreadRenderingStats() {
+}
+
 scoped_refptr<base::debug::ConvertableToTraceFormat>
 MainThreadRenderingStats::AsTraceableData() const {
   scoped_ptr<base::DictionaryValue> record_data(new base::DictionaryValue());
@@ -31,6 +34,29 @@ void MainThreadRenderingStats::Add(const MainThreadRenderingStats& other) {
   recorded_pixel_count += other.recorded_pixel_count;
 }
 
+TimeDeltaList::TimeDeltaList() {
+}
+
+TimeDeltaList::~TimeDeltaList() {
+}
+
+void TimeDeltaList::Append(base::TimeDelta value) {
+  values.push_back(value);
+}
+
+scoped_ptr<base::ListValue> 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 TimeDeltaList::Add(const TimeDeltaList& other) {
+  values.insert(values.end(), other.values.begin(), other.values.end());
+}
+
 ImplThreadRenderingStats::ImplThreadRenderingStats()
     : frame_count(0),
       rasterized_pixel_count(0),
@@ -38,6 +64,9 @@ ImplThreadRenderingStats::ImplThreadRenderingStats()
       approximated_visible_content_area(0) {
 }
 
+ImplThreadRenderingStats::~ImplThreadRenderingStats() {
+}
+
 scoped_refptr<base::debug::ConvertableToTraceFormat>
 ImplThreadRenderingStats::AsTraceableData() const {
   scoped_ptr<base::DictionaryValue> record_data(new base::DictionaryValue());
@@ -47,6 +76,26 @@ 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());
 }
 
@@ -57,6 +106,16 @@ void ImplThreadRenderingStats::Add(const ImplThreadRenderingStats& other) {
   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) {