cc: Switch RenderingStats collection in Layer::Update() to RenderingStatsInstrumentation

cc/layers/tiled_layer.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/tiled_layer.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 299 matching lines @@
   return !tile->dirty_rect.Contains(tiler_->TileRect(tile)) &&
          tile->managed_resource()->have_backing_texture();
 }
 
 bool TiledLayer::UpdateTiles(int left,
                              int top,
                              int right,
                              int bottom,
                              ResourceUpdateQueue* queue,
                              const OcclusionTracker* occlusion,
-                             RenderingStats* stats,
                              bool* did_paint) {
   *did_paint = false;
   CreateUpdaterIfNeeded();
 
   bool ignore_occlusions = !occlusion;
   if (!HaveTexturesForTiles(left, top, right, bottom, ignore_occlusions)) {
     failed_update_ = true;
     return false;
   }
 
   gfx::Rect paint_rect =
       MarkTilesForUpdate(left, top, right, bottom, ignore_occlusions);
 
   if (occlusion)
     occlusion->overdraw_metrics()->DidPaint(paint_rect);
 
   if (paint_rect.IsEmpty())
     return true;
 
   *did_paint = true;
   UpdateTileTextures(
-      paint_rect, left, top, right, bottom, queue, occlusion, stats);
+      paint_rect, left, top, right, bottom, queue, occlusion);
   return true;
 }
 
 void TiledLayer::MarkOcclusionsAndRequestTextures(
     int left,
     int top,
     int right,
     int bottom,
     const OcclusionTracker* occlusion) {
   // There is some difficult dependancies between occlusions, recording
@@ skipping 105 matching lines @@
   }
   return paint_rect;
 }
 
 void TiledLayer::UpdateTileTextures(gfx::Rect paint_rect,
                                     int left,
                                     int top,
                                     int right,
                                     int bottom,
                                     ResourceUpdateQueue* queue,
-                                    const OcclusionTracker* occlusion,
-                                    RenderingStats* stats) {
+                                    const OcclusionTracker* occlusion) {
   // The update_rect should be in layer space. So we have to convert the
   // paint_rect from content space to layer space.
   float width_scale =
       bounds().width() / static_cast<float>(content_bounds().width());
   float height_scale =
       bounds().height() / static_cast<float>(content_bounds().height());
   update_rect_ = gfx::ScaleRect(paint_rect, width_scale, height_scale);
 
   // Calling PrepareToUpdate() calls into WebKit to paint, which may have the
   // side effect of disabling compositing, which causes our reference to the
   // texture updater to be deleted.  However, we can't free the memory backing
   // the SkCanvas until the paint finishes, so we grab a local reference here to
   // hold the updater alive until the paint completes.
   scoped_refptr<LayerUpdater> protector(Updater());
   gfx::Rect painted_opaque_rect;
   Updater()->PrepareToUpdate(paint_rect,
                              tiler_->tile_size(),
                              1.f / width_scale,
                              1.f / height_scale,
-                             &painted_opaque_rect,
-                             stats);
+                             &painted_opaque_rect);
 
   for (int j = top; j <= bottom; ++j) {
     for (int i = left; i <= right; ++i) {
       UpdatableTile* tile = TileAt(i, j);
       DCHECK(tile);  // Did SetTexturePriorites get skipped?
                      // FIXME: This should not ever be null.
       if (!tile)
         continue;
 
       gfx::Rect tile_rect = tiler_->tile_bounds(i, j);
@@ skipping 44 matching lines @@
       CHECK_GE(dest_offset.y(), 0);
 
       // Offset from paint rectangle to this tile's dirty rectangle.
       gfx::Vector2d paint_offset = source_rect.origin() - paint_rect.origin();
       CHECK_GE(paint_offset.x(), 0);
       CHECK_GE(paint_offset.y(), 0);
       CHECK_LE(paint_offset.x() + source_rect.width(), paint_rect.width());
       CHECK_LE(paint_offset.y() + source_rect.height(), paint_rect.height());
 
       tile->updater_resource()->Update(
-          queue, source_rect, dest_offset, tile->partial_update, stats);
+          queue, source_rect, dest_offset, tile->partial_update);
       if (occlusion) {
         occlusion->overdraw_metrics()->
             DidUpload(gfx::Transform(), source_rect, tile->opaque_rect());
       }
     }
   }
 }
 
 // This picks a small animated layer to be anything less than one viewport. This
 // is specifically for page transitions which are viewport-sized layers. The
@@ skipping 146 matching lines @@
     bound.Inset(-tiler_->tile_size().width() * kMaxPredictiveTilesCount,
                 -tiler_->tile_size().height() * kMaxPredictiveTilesCount);
     bound.Intersect(gfx::Rect(content_bounds()));
     predicted_visible_rect_.Intersect(bound);
   }
   previous_content_bounds_ = content_bounds();
   previous_visible_rect_ = visible_content_rect();
 }
 
 void TiledLayer::Update(ResourceUpdateQueue* queue,
-                        const OcclusionTracker* occlusion,
-                        RenderingStats* stats) {
+                        const OcclusionTracker* occlusion) {
   DCHECK(!skips_draw_ && !failed_update_);  // Did ResetUpdateState get skipped?
   {
     base::AutoReset<bool> ignore_set_needs_commit(&ignore_set_needs_commit_,
                                                   true);
 
-    ContentsScalingLayer::Update(queue, occlusion, stats);
+    ContentsScalingLayer::Update(queue, occlusion);
     UpdateBounds();
   }
 
   if (tiler_->has_empty_bounds() || !DrawsContent())
     return;
 
   bool did_paint = false;
 
   // Animation pre-paint. If the layer is small, try to paint it all
   // immediately whether or not it is occluded, to avoid paint/upload
   // hiccups while it is animating.
   if (IsSmallAnimatedLayer()) {
     int left, top, right, bottom;
     tiler_->ContentRectToTileIndices(gfx::Rect(content_bounds()),
                                      &left,
                                      &top,
                                      &right,
                                      &bottom);
-    UpdateTiles(left, top, right, bottom, queue, NULL, stats, &did_paint);
+    UpdateTiles(left, top, right, bottom, queue, NULL, &did_paint);
     if (did_paint)
       return;
     // This was an attempt to paint the entire layer so if we fail it's okay,
     // just fallback on painting visible etc. below.
     failed_update_ = false;
   }
 
   if (predicted_visible_rect_.IsEmpty())
     return;
 
   // Visible painting. First occlude visible tiles and paint the non-occluded
   // tiles.
   int left, top, right, bottom;
   tiler_->ContentRectToTileIndices(
       predicted_visible_rect_, &left, &top, &right, &bottom);
   MarkOcclusionsAndRequestTextures(left, top, right, bottom, occlusion);
   skips_draw_ = !UpdateTiles(
-      left, top, right, bottom, queue, occlusion, stats, &did_paint);
+      left, top, right, bottom, queue, occlusion, &did_paint);
   if (skips_draw_)
     tiler_->reset();
   if (skips_draw_ || did_paint)
     return;
 
   // If we have already painting everything visible. Do some pre-painting while
   // idle.
   gfx::Rect idle_paint_content_rect = IdlePaintRect();
   if (idle_paint_content_rect.IsEmpty())
     return;
 
   // Prepaint anything that was occluded but inside the layer's visible region.
-  if (!UpdateTiles(left, top, right, bottom, queue, NULL, stats, &did_paint) ||
+  if (!UpdateTiles(left, top, right, bottom, queue, NULL, &did_paint) ||
       did_paint)
     return;
 
   int prepaint_left, prepaint_top, prepaint_right, prepaint_bottom;
   tiler_->ContentRectToTileIndices(idle_paint_content_rect,
                                    &prepaint_left,
                                    &prepaint_top,
                                    &prepaint_right,
                                    &prepaint_bottom);
 
   // Then expand outwards one row/column at a time until we find a dirty
   // row/column to update. Increment along the major and minor scroll directions
   // first.
   gfx::Vector2d delta = -predicted_scroll_;
   delta = gfx::Vector2d(delta.x() == 0 ? 1 : delta.x(),
                         delta.y() == 0 ? 1 : delta.y());
   gfx::Vector2d major_delta =
       (abs(delta.x()) > abs(delta.y())) ? gfx::Vector2d(delta.x(), 0)
                                         : gfx::Vector2d(0, delta.y());
   gfx::Vector2d minor_delta =
       (abs(delta.x()) <= abs(delta.y())) ? gfx::Vector2d(delta.x(), 0)
                                          : gfx::Vector2d(0, delta.y());
   gfx::Vector2d deltas[4] = { major_delta, minor_delta, -major_delta,
                               -minor_delta };
   for (int i = 0; i < 4; i++) {
     if (deltas[i].y() > 0) {
       while (bottom < prepaint_bottom) {
         ++bottom;
         if (!UpdateTiles(
-                left, bottom, right, bottom, queue, NULL, stats, &did_paint) ||
+                left, bottom, right, bottom, queue, NULL, &did_paint) ||
             did_paint)
           return;
       }
     }
     if (deltas[i].y() < 0) {
       while (top > prepaint_top) {
         --top;
         if (!UpdateTiles(
-                left, top, right, top, queue, NULL, stats, &did_paint) ||
+                left, top, right, top, queue, NULL, &did_paint) ||
             did_paint)
           return;
       }
     }
     if (deltas[i].x() < 0) {
       while (left > prepaint_left) {
         --left;
         if (!UpdateTiles(
-                left, top, left, bottom, queue, NULL, stats, &did_paint) ||
+                left, top, left, bottom, queue, NULL, &did_paint) ||
             did_paint)
           return;
       }
     }
     if (deltas[i].x() > 0) {
       while (right < prepaint_right) {
         ++right;
         if (!UpdateTiles(
-                right, top, right, bottom, queue, NULL, stats, &did_paint) ||
+                right, top, right, bottom, queue, NULL, &did_paint) ||
             did_paint)
           return;
       }
     }
   }
 }
 
 bool TiledLayer::NeedsIdlePaint() {
   // Don't trigger more paints if we failed (as we'll just fail again).
   if (failed_update_ || visible_content_rect().IsEmpty() ||
@@ skipping 35 matching lines @@
   gfx::Rect prepaint_rect = visible_content_rect();
   prepaint_rect.Inset(-tiler_->tile_size().width() * kPrepaintColumns,
                       -tiler_->tile_size().height() * kPrepaintRows);
   gfx::Rect content_rect(content_bounds());
   prepaint_rect.Intersect(content_rect);
 
   return prepaint_rect;
 }
 
 }  // namespace cc