Adding hooks for gathering total pixels painted and rasterized stats.

content/renderer/render_widget.cc

 // Copyright (c) 2012 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 "content/renderer/render_widget.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 655 matching lines @@
   // which case we do not want to unfocus ourself.
   if (!has_focus_ && webwidget_)
     webwidget_->setFocus(false);
 }
 
 void RenderWidget::PaintRect(const gfx::Rect& rect,
                              const gfx::Point& canvas_origin,
                              skia::PlatformCanvas* canvas) {
   TRACE_EVENT2("renderer", "PaintRect",
                "width", rect.width(), "height", rect.height());
+
+  base::TimeTicks rasterize_begin_ticks;
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableGpuBenchmarking))
+    rasterize_begin_ticks = base::TimeTicks::HighResNow();
   canvas->save();
 
   // Bring the canvas into the coordinate system of the paint rect.
   canvas->translate(static_cast<SkScalar>(-canvas_origin.x()),
                     static_cast<SkScalar>(-canvas_origin.y()));
 
   // If there is a custom background, tile it.
   if (!background_.empty()) {
     SkPaint paint;
     SkShader* shader = SkShader::CreateBitmapShader(background_,
@@ skipping 35 matching lines @@
     // GetBitmapForOptimizedPluginPaint in DoDeferredUpdate handles the
     // painting, because that avoids copying the plugin image to a different
     // paint rect. Unfortunately, if anything on the page is animating other
     // than the movie, it break this optimization since the union of the
     // invalid regions will be larger than the plugin.
     //
     // This code optimizes that case, where we can still avoid painting in
     // WebKit and filling the background (which can be slow) and just painting
     // the plugin. Unlike the DoDeferredUpdate case, an extra copy is still
     // required.
-    base::TimeTicks paint_begin_ticks = base::TimeTicks::Now();
+    base::TimeTicks paint_begin_ticks;
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kEnableGpuBenchmarking))

[jamesr, 2012/11/08 23:33:12]

we're repeating this a lot - can we stash this in a bool just for readability?

[hartmanng, 2012/11/09 14:07:11]

Done.

+      paint_begin_ticks = base::TimeTicks::HighResNow();
+
     SkAutoCanvasRestore auto_restore(canvas, true);
     canvas->scale(device_scale_factor_, device_scale_factor_);
     optimized_instance->Paint(webkit_glue::ToWebCanvas(canvas),
                               optimized_copy_location, rect);
     canvas->restore();
-    base::TimeDelta paint_time = base::TimeTicks::Now() - paint_begin_ticks;
-    if (!is_accelerated_compositing_active_)
-      software_stats_.totalPaintTimeInSeconds += paint_time.InSecondsF();
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kEnableGpuBenchmarking)) {
+      base::TimeDelta paint_time =
+          base::TimeTicks::HighResNow() - paint_begin_ticks;
+      if (!is_accelerated_compositing_active_)
+        software_stats_.totalPaintTimeInSeconds += paint_time.InSecondsF();
+    }
   } else {
     // Normal painting case.
-    base::TimeTicks paint_begin_ticks = base::TimeTicks::Now();
+    base::TimeTicks paint_begin_ticks;
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kEnableGpuBenchmarking))
+      paint_begin_ticks = base::TimeTicks::HighResNow();
+
     webwidget_->paint(webkit_glue::ToWebCanvas(canvas), rect);
-    base::TimeDelta paint_time = base::TimeTicks::Now() - paint_begin_ticks;
-    if (!is_accelerated_compositing_active_)
-      software_stats_.totalPaintTimeInSeconds += paint_time.InSecondsF();
+
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kEnableGpuBenchmarking)) {
+      base::TimeDelta paint_time =
+          base::TimeTicks::HighResNow() - paint_begin_ticks;
+      if (!is_accelerated_compositing_active_)
+        software_stats_.totalPaintTimeInSeconds += paint_time.InSecondsF();
+    }
 
     // Flush to underlying bitmap.  TODO(darin): is this needed?
     skia::GetTopDevice(*canvas)->accessBitmap(false);
   }
 
   PaintDebugBorder(rect, canvas);
   canvas->restore();
+
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableGpuBenchmarking)) {
+    base::TimeDelta rasterize_time =
+        base::TimeTicks::HighResNow() - rasterize_begin_ticks;
+    software_stats_.totalRasterizeTimeInSeconds += rasterize_time.InSecondsF();
+
+    int64 num_pixels_processed = rect.width() * rect.height();
+    software_stats_.totalPixelsPainted += num_pixels_processed;
+    software_stats_.totalPixelsRasterized += num_pixels_processed;
+  }
 }
 
 void RenderWidget::PaintDebugBorder(const gfx::Rect& rect,
                                     skia::PlatformCanvas* canvas) {
   static bool kPaintBorder =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kShowPaintRects);
   if (!kPaintBorder)
     return;
 
   // Cycle through these colors to help distinguish new paint rects.
@@ skipping 1126 matching lines @@
       break;
     }
   }
 }
 
 void RenderWidget::GetRenderingStats(WebKit::WebRenderingStats& stats) const {
   webwidget()->renderingStats(stats);
   stats.numAnimationFrames += software_stats_.numAnimationFrames;
   stats.numFramesSentToScreen += software_stats_.numFramesSentToScreen;
   stats.totalPaintTimeInSeconds += software_stats_.totalPaintTimeInSeconds;
+  stats.totalPixelsPainted += software_stats_.totalPixelsPainted;
+  stats.totalRasterizeTimeInSeconds +=
+      software_stats_.totalRasterizeTimeInSeconds;
+  stats.totalPixelsRasterized += software_stats_.totalPixelsRasterized;
 }
 
 bool RenderWidget::GetGpuRenderingStats(GpuRenderingStats* stats) const {
   GpuChannelHost* gpu_channel = RenderThreadImpl::current()->GetGpuChannel();
   if (!gpu_channel)
     return false;
 
   return gpu_channel->CollectRenderingStatsForSurface(surface_id(), stats);
 }
 
@@ skipping 23 matching lines @@
 bool RenderWidget::WillHandleGestureEvent(
     const WebKit::WebGestureEvent& event) {
   return false;
 }
 
 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const {
   return false;
 }
 
 }  // namespace content