Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / cc / debug / rendering_stats.cc

diff --git a/src/cc/debug/rendering_stats.cc b/src/cc/debug/rendering_stats.cc
index b5989fc..558c882 100644 (file)
--- a/src/cc/debug/rendering_stats.cc
+++ b/src/cc/debug/rendering_stats.cc
@@ -28,8 +28,12 @@ void RenderingStats::TimeDeltaList::Add(const TimeDeltaList& other) {
   values.insert(values.end(), other.values.begin(), other.values.end());
 }
 
+base::TimeDelta RenderingStats::TimeDeltaList::GetLastTimeDelta() const {
+  return values.empty() ? base::TimeDelta() : values.back();
+}
+
 RenderingStats::MainThreadRenderingStats::MainThreadRenderingStats()
-    : frame_count(0), painted_pixel_count(0), recorded_pixel_count(0) {
+    : painted_pixel_count(0), recorded_pixel_count(0) {
 }
 
 RenderingStats::MainThreadRenderingStats::~MainThreadRenderingStats() {
@@ -39,7 +43,6 @@ scoped_refptr<base::debug::ConvertableToTraceFormat>
 RenderingStats::MainThreadRenderingStats::AsTraceableData() const {
   scoped_refptr<base::debug::TracedValue> record_data =
       new base::debug::TracedValue();
-  record_data->SetInteger("frame_count", frame_count);
   record_data->SetDouble("paint_time", paint_time.InSecondsF());
   record_data->SetInteger("painted_pixel_count", painted_pixel_count);
   record_data->SetDouble("record_time", record_time.InSecondsF());
@@ -49,7 +52,6 @@ RenderingStats::MainThreadRenderingStats::AsTraceableData() const {
 
 void RenderingStats::MainThreadRenderingStats::Add(
     const MainThreadRenderingStats& other) {
-  frame_count += other.frame_count;
   paint_time += other.paint_time;
   painted_pixel_count += other.painted_pixel_count;
   record_time += other.record_time;
@@ -58,7 +60,6 @@ void RenderingStats::MainThreadRenderingStats::Add(
 
 RenderingStats::ImplThreadRenderingStats::ImplThreadRenderingStats()
     : frame_count(0),
-      rasterized_pixel_count(0),
       visible_content_area(0),
       approximated_visible_content_area(0) {
 }
@@ -71,8 +72,6 @@ RenderingStats::ImplThreadRenderingStats::AsTraceableData() const {
   scoped_refptr<base::debug::TracedValue> record_data =
       new base::debug::TracedValue();
   record_data->SetInteger("frame_count", frame_count);
-  record_data->SetDouble("rasterize_time", rasterize_time.InSecondsF());
-  record_data->SetInteger("rasterized_pixel_count", rasterized_pixel_count);
   record_data->SetInteger("visible_content_area", visible_content_area);
   record_data->SetInteger("approximated_visible_content_area",
                           approximated_visible_content_area);
@@ -106,9 +105,6 @@ RenderingStats::ImplThreadRenderingStats::AsTraceableData() const {
 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;