Make GPU benchmarking numAnimationFrames and totalPaintTime work in software mode.

content/renderer/render_widget.h

Index: content/renderer/render_widget.h
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index 068abd3ff53b55d296d6ae4e6f48c0dc3c6ac538..4a705db393c135f50930291efc19e0d06a9a4046 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -17,6 +17,7 @@
 #include "content/common/content_export.h"
 #include "content/renderer/paint_aggregator.h"
 #include "ipc/ipc_channel.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebRenderingStats.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
@@ -152,6 +153,12 @@ class CONTENT_EXPORT RenderWidget
   // pending moves don't try to reference it.
   void CleanupWindowInPluginMoves(gfx::PluginWindowHandle window);
 
+  // Fills in a WebRenderingStats struct containing information about
+  // rendering, e.g. count of frames rendered, time spent painting.
+  // This call is relatively expensive in threaded compositing mode,
+  // as it blocks on the compositor thread.
+  void GetRenderingStats(WebKit::WebRenderingStats&) const;
+
   // Directs the host to begin a smooth scroll. This scroll should have the same
   // performance characteristics as a user-initiated scroll.
   void BeginSmoothScroll(bool scroll_down, bool scroll_far);
@@ -543,6 +550,8 @@ class CONTENT_EXPORT RenderWidget
   bool has_disable_gpu_vsync_switch_;
   base::TimeTicks last_do_deferred_update_time_;
 
+  WebKit::WebRenderingStats software_stats_;
+
   // UpdateRect parameters for the current compositing pass. This is used to
   // pass state between DoDeferredUpdate and OnSwapBuffersPosted.
   scoped_ptr<ViewHostMsg_UpdateRect_Params> pending_update_params_;