Make GPU benchmarking numAnimationFrames and totalPaintTime work in software mode.

content/renderer/gpu/gpu_benchmarking_extension.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/gpu/gpu_benchmarking_extension.h"
 #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;
 using WebKit::WebRenderingStats;
 using WebKit::WebView;
 
 const char kGpuBenchmarkingExtensionName[] = "v8/GpuBenchmarking";
 
 using WebKit::WebFrame;
 using WebKit::WebView;
@@ skipping 38 matching lines @@
 
   static v8::Handle<v8::Value> GetRenderingStats(const v8::Arguments& args) {
     WebFrame* web_frame = WebFrame::frameForEnteredContext();
     if (!web_frame)
       return v8::Undefined();
 
     WebView* web_view = web_frame->view();
     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)
       stats_object->Set(v8::String::New("numAnimationFrames"),
                         v8::Integer::New(stats.numAnimationFrames),
                         v8::ReadOnly);
     if (stats.numFramesSentToScreen)
       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;
   }
 
   static v8::Handle<v8::Value> BeginSmoothScroll(const v8::Arguments& args) {
     WebFrame* web_frame = WebFrame::frameForEnteredContext();
     if (!web_frame)
       return v8::Undefined();
 
     WebView* web_view = web_frame->view();
     if (!web_view)
@@ skipping 12 matching lines @@
     render_view_impl->BeginSmoothScroll(scroll_down, scroll_far);
     return v8::True();
   }
 };
 
 v8::Extension* GpuBenchmarkingExtension::Get() {
   return new GpuBenchmarkingWrapper();
 }
 
 }  // namespace content