Make GPU benchmarking numAnimationFrames and totalPaintTime work in software mode.

content/renderer/gpu/gpu_benchmarking_extension.cc

Index: content/renderer/gpu/gpu_benchmarking_extension.cc
diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc
index 8590e1116b855eaadbe95d5ba3ac47d569435e58..edb21989311fa09096e506bd41fbf390880e8e37 100644
--- a/content/renderer/gpu/gpu_benchmarking_extension.cc
+++ b/content/renderer/gpu/gpu_benchmarking_extension.cc
@@ -6,8 +6,6 @@
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebRenderingStats.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "v8/include/v8.h"
 
 using WebKit::WebFrame;
@@ -66,8 +64,12 @@ class GpuBenchmarkingWrapper : public v8::Extension {
     if (!web_view)
       return v8::Undefined();
 
+    RenderViewImpl* render_view_impl = RenderViewImpl::FromWebView(web_view);
+    if (!render_view_impl)
+      return v8::Undefined();
+
     WebRenderingStats stats;
-    web_view->renderingStats(stats);
+    render_view_impl->GetRenderingStats(stats);
 
     v8::Handle<v8::Object> stats_object = v8::Object::New();
     if (stats.numAnimationFrames)
@@ -78,6 +80,18 @@ class GpuBenchmarkingWrapper : public v8::Extension {
       stats_object->Set(v8::String::New("numFramesSentToScreen"),
                         v8::Integer::New(stats.numFramesSentToScreen),
                         v8::ReadOnly);
+    if (stats.droppedFrameCount)
+      stats_object->Set(v8::String::New("droppedFrameCount"),
+                        v8::Integer::New(stats.droppedFrameCount),
+                        v8::ReadOnly);
+    if (stats.totalPaintTimeInSeconds)
+      stats_object->Set(v8::String::New("totalPaintTimeInSeconds"),
+                        v8::Number::New(stats.totalPaintTimeInSeconds),
+                        v8::ReadOnly);
+    if (stats.totalRasterizeTimeInSeconds)
+      stats_object->Set(v8::String::New("totalRasterizeTimeInSeconds"),
+                        v8::Number::New(stats.totalRasterizeTimeInSeconds),
+                        v8::ReadOnly);
     return stats_object;
   }