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 <string>
 
 #include "base/memory/scoped_vector.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/all_rendering_benchmarks.h"
 #include "content/renderer/rendering_benchmark.h"
 #include "content/renderer/rendering_benchmark_results.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/WebViewBenchmarkSupport.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "v8/include/v8.h"
 
 using WebKit::WebFrame;
 using WebKit::WebPrivatePtr;
 using WebKit::WebViewBenchmarkSupport;
 using WebKit::WebRenderingStats;
 using WebKit::WebView;
 
 const char kGpuBenchmarkingExtensionName[] = "v8/GpuBenchmarking";
 
-using WebKit::WebFrame;
-using WebKit::WebView;
-
 namespace content {
 
 // Benchmark results object that populates a v8 array.
 class V8BenchmarkResults : public content::RenderingBenchmarkResults {
  public:
   explicit V8BenchmarkResults()
     : results_array_(v8::Array::New(0)) { }
   virtual ~V8BenchmarkResults() {}
 
   void AddResult(const std::string& benchmark_name,
@@ skipping 64 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);
@@ skipping 84 matching lines @@
 
     return results.results_array();
   }
 };
 
 v8::Extension* GpuBenchmarkingExtension::Get() {
   return new GpuBenchmarkingWrapper();
 }
 
 }  // namespace content