cc: Record statistics about approximated content.

Record the total visible content area and the approximated visible content
area. Approximated area is the visible area covered by low-res or missing tiles.
These statistics will be used in a follow-up patch to report the percentage of
pixels that were approximated in smoothness benchmark.

R=vmpstr@chromium.org,enne@chromium.org,
BUG=308652

Review URL: https://codereview.chromium.org/258093005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267088 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 53 insertions, 1 deletions

diff --git a/cc/debug/rendering_stats.cc b/cc/debug/rendering_stats.cc
index 5c194c6..3e123b66 100644
--- a/cc/debug/rendering_stats.cc
+++ b/cc/debug/rendering_stats.cc
@@ -33,7 +33,10 @@ void MainThreadRenderingStats::Add(const MainThreadRenderingStats& other) {
 
 ImplThreadRenderingStats::ImplThreadRenderingStats()
     : frame_count(0),
-      rasterized_pixel_count(0) {}
+      rasterized_pixel_count(0),
+      visible_content_area(0),
+      approximated_visible_content_area(0) {
+}
 
 scoped_refptr<base::debug::ConvertableToTraceFormat>
 ImplThreadRenderingStats::AsTraceableData() const {
@@ -41,6 +44,9 @@ ImplThreadRenderingStats::AsTraceableData() const {
   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);
   return TracedValue::FromValue(record_data.release());
 }
 
@@ -49,6 +55,8 @@ void ImplThreadRenderingStats::Add(const ImplThreadRenderingStats& other) {
   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;
 }
 
 void RenderingStats::Add(const RenderingStats& other) {
diff --git a/cc/debug/rendering_stats.h b/cc/debug/rendering_stats.h
index 72262c8..bd3b7c7 100644
--- a/cc/debug/rendering_stats.h
+++ b/cc/debug/rendering_stats.h
@@ -35,6 +35,8 @@ struct CC_EXPORT ImplThreadRenderingStats {
   base::TimeDelta rasterize_time;
   base::TimeDelta analysis_time;
   int64 rasterized_pixel_count;
+  int64 visible_content_area;
+  int64 approximated_visible_content_area;
 
   ImplThreadRenderingStats();
   scoped_refptr<base::debug::ConvertableToTraceFormat> AsTraceableData() const;
diff --git a/cc/debug/rendering_stats_instrumentation.cc b/cc/debug/rendering_stats_instrumentation.cc
index 63840a3..36893f8 100644
--- a/cc/debug/rendering_stats_instrumentation.cc
+++ b/cc/debug/rendering_stats_instrumentation.cc
@@ -108,4 +108,21 @@ void RenderingStatsInstrumentation::AddAnalysis(base::TimeDelta duration,
   impl_stats_.analysis_time += duration;
 }
 
+void RenderingStatsInstrumentation::AddVisibleContentArea(int64 area) {
+  if (!record_rendering_stats_)
+    return;
+
+  base::AutoLock scoped_lock(lock_);
+  impl_stats_.visible_content_area += area;
+}
+
+void RenderingStatsInstrumentation::AddApproximatedVisibleContentArea(
+    int64 area) {
+  if (!record_rendering_stats_)
+    return;
+
+  base::AutoLock scoped_lock(lock_);
+  impl_stats_.approximated_visible_content_area += area;
+}
+
 }  // namespace cc
diff --git a/cc/debug/rendering_stats_instrumentation.h b/cc/debug/rendering_stats_instrumentation.h
index 6811755..3a02fe9 100644
--- a/cc/debug/rendering_stats_instrumentation.h
+++ b/cc/debug/rendering_stats_instrumentation.h
@@ -53,6 +53,8 @@ class CC_EXPORT RenderingStatsInstrumentation {
   void AddRecord(base::TimeDelta duration, int64 pixels);
   void AddRaster(base::TimeDelta duration, int64 pixels);
   void AddAnalysis(base::TimeDelta duration, int64 pixels);
+  void AddVisibleContentArea(int64 area);
+  void AddApproximatedVisibleContentArea(int64 area);
 
  protected:
   RenderingStatsInstrumentation();
diff --git a/cc/layers/append_quads_data.h b/cc/layers/append_quads_data.h
index 5e19731..7c6768f 100644
--- a/cc/layers/append_quads_data.h
+++ b/cc/layers/append_quads_data.h
@@ -14,17 +14,25 @@ struct AppendQuadsData {
   AppendQuadsData()
       : had_incomplete_tile(false),
         num_missing_tiles(0),
+        visible_content_area(0),
+        approximated_visible_content_area(0),
         render_pass_id(0, 0) {}
 
   explicit AppendQuadsData(RenderPass::Id render_pass_id)
       : had_incomplete_tile(false),
         num_missing_tiles(0),
+        visible_content_area(0),
+        approximated_visible_content_area(0),
         render_pass_id(render_pass_id) {}
 
   // Set by the layer appending quads.
   bool had_incomplete_tile;
   // Set by the layer appending quads.
   int64 num_missing_tiles;
+  // Set by the layer appending quads.
+  int64 visible_content_area;
+  // Set by the layer appending quads.
+  int64 approximated_visible_content_area;
   // Given to the layer appending quads.
   const RenderPass::Id render_pass_id;
 };
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index 8d08bbc..39af47d 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -238,6 +238,9 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
     if (visible_geometry_rect.IsEmpty())
       continue;
 
+    append_quads_data->visible_content_area +=
+        visible_geometry_rect.width() * visible_geometry_rect.height();
+
     if (!*iter || !iter->IsReadyToDraw()) {
       if (draw_checkerboard_for_missing_tiles()) {
         scoped_ptr<CheckerboardDrawQuad> quad = CheckerboardDrawQuad::Create();
@@ -258,6 +261,8 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
 
       append_quads_data->num_missing_tiles++;
       append_quads_data->had_incomplete_tile = true;
+      append_quads_data->approximated_visible_content_area +=
+          visible_geometry_rect.width() * visible_geometry_rect.height();
       continue;
     }
 
@@ -323,6 +328,11 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
     DCHECK(draw_quad);
     quad_sink->Append(draw_quad.Pass());
 
+    if (iter->priority(ACTIVE_TREE).resolution != HIGH_RESOLUTION) {
+      append_quads_data->approximated_visible_content_area +=
+          visible_geometry_rect.width() * visible_geometry_rect.height();
+    }
+
     if (seen_tilings.empty() || seen_tilings.back() != iter.CurrentTiling())
       seen_tilings.push_back(iter.CurrentTiling());
   }
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 3ed0aee..2f7bf0d 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -861,6 +861,11 @@ DrawSwapReadbackResult::DrawResult LayerTreeHostImpl::CalculateRenderPasses(
       ++layers_drawn;
     }
 
+    rendering_stats_instrumentation_->AddVisibleContentArea(
+        append_quads_data.visible_content_area);
+    rendering_stats_instrumentation_->AddApproximatedVisibleContentArea(
+        append_quads_data.approximated_visible_content_area);
+
     if (append_quads_data.num_missing_tiles) {
       bool layer_has_animating_transform =
           it->screen_space_transform_is_animating() ||