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

cc/layers/content_layer.cc

 // Copyright 2010 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/content_layer.h"
 
 #include "base/auto_reset.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
 #include "cc/layers/content_layer_client.h"
@@ skipping 50 matching lines @@
 
 void ContentLayer::SetTexturePriorities(
     const PriorityCalculator& priority_calc) {
   // Update the tile data before creating all the layer's tiles.
   UpdateTileSizeAndTilingOption();
 
   TiledLayer::SetTexturePriorities(priority_calc);
 }
 
 void ContentLayer::Update(ResourceUpdateQueue* queue,
-                          const OcclusionTracker* occlusion,
-                          RenderingStats* stats) {
+                          const OcclusionTracker* occlusion) {
   {
     base::AutoReset<bool> ignore_set_needs_commit(&ignore_set_needs_commit_,
                                                   true);
 
     CreateUpdaterIfNeeded();
     UpdateCanUseLCDText();
   }
 
-  TiledLayer::Update(queue, occlusion, stats);
+  TiledLayer::Update(queue, occlusion);
   needs_display_ = false;
 }
 
 bool ContentLayer::NeedMoreUpdates() {
   return NeedsIdlePaint();
 }
 
 LayerUpdater* ContentLayer::Updater() const {
   return updater_.get();
 }
 
 void ContentLayer::CreateUpdaterIfNeeded() {
   if (updater_)
     return;
   scoped_ptr<LayerPainter> painter =
       ContentLayerPainter::Create(client_).PassAs<LayerPainter>();
   if (layer_tree_host()->settings().accelerate_painting)
-    updater_ = SkPictureContentLayerUpdater::Create(painter.Pass());
+    updater_ = SkPictureContentLayerUpdater::Create(
+        painter.Pass(),
+        rendering_stats_instrumentation());
   else if (layer_tree_host()->settings().per_tile_painting_enabled)
-    updater_ = BitmapSkPictureContentLayerUpdater::Create(painter.Pass());
+    updater_ = BitmapSkPictureContentLayerUpdater::Create(
+        painter.Pass(),
+        rendering_stats_instrumentation());
   else
-    updater_ = BitmapContentLayerUpdater::Create(painter.Pass());
+    updater_ = BitmapContentLayerUpdater::Create(
+        painter.Pass(),
+        rendering_stats_instrumentation());
   updater_->SetOpaque(contents_opaque());
 
   unsigned texture_format =
       layer_tree_host()->GetRendererCapabilities().best_texture_format;
   SetTextureFormat(texture_format);
 }
 
 void ContentLayer::SetContentsOpaque(bool opaque) {
   Layer::SetContentsOpaque(opaque);
   if (updater_)
     updater_->SetOpaque(opaque);
 }
 
 void ContentLayer::UpdateCanUseLCDText() {
   if (can_use_lcd_text_last_frame_ == can_use_lcd_text())
     return;
 
   can_use_lcd_text_last_frame_ = can_use_lcd_text();
   if (client_)
     client_->DidChangeLayerCanUseLCDText();
 }
 
 }  // namespace cc