Revert 191086 "cc: Switch RenderingStats collection in Layer::Up..."

Looks like its DCHECKing on Win Aura interactive_ui_tests again. Same
error as before.

http://build.chromium.org/p/chromium.win/buildstatus?builder=Win%20Aura%20Tests%20%283%29&number=2148

> cc: Switch RenderingStats collection in Layer::Update() to RenderingStatsInstrumentation
> 
> This change switches all of the remaining RenderingStats collection in
> composited mode to use RenderinStatsInstrumentation.
> 
> BUG=181319
> 
> 
> Review URL: https://chromiumcodereview.appspot.com/12426024

TBR=egraether@chromium.org
Review URL: https://codereview.chromium.org/13145002

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

1 files changed, 12 insertions, 18 deletions

diff --git a/cc/resources/content_layer_updater.cc b/cc/resources/content_layer_updater.cc
index a1d9fdf..f11083b 100644
--- a/cc/resources/content_layer_updater.cc
+++ b/cc/resources/content_layer_updater.cc
@@ -6,7 +6,7 @@
 
 #include "base/debug/trace_event.h"
 #include "base/time.h"
-#include "cc/debug/rendering_stats_instrumentation.h"
+#include "cc/debug/rendering_stats.h"
 #include "cc/resources/layer_painter.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
@@ -17,11 +17,8 @@
 
 namespace cc {
 
-ContentLayerUpdater::ContentLayerUpdater(
-    scoped_ptr<LayerPainter> painter,
-    RenderingStatsInstrumentation* stats_instrumentation)
-    : painter_(painter.Pass()),
-      rendering_stats_instrumentation_(stats_instrumentation) {}
+ContentLayerUpdater::ContentLayerUpdater(scoped_ptr<LayerPainter> painter)
+    : painter_(painter.Pass()) {}
 
 ContentLayerUpdater::~ContentLayerUpdater() {}
 
@@ -29,7 +26,8 @@ void ContentLayerUpdater::PaintContents(SkCanvas* canvas,
                                         gfx::Rect content_rect,
                                         float contents_width_scale,
                                         float contents_height_scale,
-                                        gfx::Rect* resulting_opaque_rect) {
+                                        gfx::Rect* resulting_opaque_rect,
+                                        RenderingStats* stats) {
   TRACE_EVENT0("cc", "ContentLayerUpdater::PaintContents");
   canvas->save();
   canvas->translate(SkFloatToScalar(-content_rect.x()),
@@ -55,18 +53,14 @@ void ContentLayerUpdater::PaintContents(SkCanvas* canvas,
   canvas->clipRect(layer_sk_rect);
 
   gfx::RectF opaque_layer_rect;
-
-  base::TimeTicks start_time =
-      rendering_stats_instrumentation_->StartRecording();
-
+  base::TimeTicks paint_begin_time;
+  if (stats)
+    paint_begin_time = base::TimeTicks::Now();
   painter_->Paint(canvas, layer_rect, &opaque_layer_rect);
-
-  base::TimeDelta duration =
-      rendering_stats_instrumentation_->EndRecording(start_time);
-  rendering_stats_instrumentation_->AddPaint(
-      duration,
-      content_rect.width() * content_rect.height());
-
+  if (stats) {
+    stats->total_paint_time += base::TimeTicks::Now() - paint_begin_time;
+    stats->total_pixels_painted += content_rect.width() * content_rect.height();
+  }
   canvas->restore();
 
   gfx::RectF opaque_content_rect = gfx::ScaleRect(