Plumb cc::CCRenderingStats from gpu_benchmarking to cc

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 90d5850e9ca4a5b0f8bc4719e408b4402184d898..0e43fc370d369354fd9d699bb1fd933b79d1b220 100644
--- a/content/renderer/gpu/gpu_benchmarking_extension.cc
+++ b/content/renderer/gpu/gpu_benchmarking_extension.cc
@@ -18,16 +18,15 @@
 #include "third_party/skia/include/core/SkGraphics.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkStream.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/WebViewBenchmarkSupport.h"
 #include "v8/include/v8.h"
+#include "webkit/glue/compositor_rendering_stats.h"
 
 using WebKit::WebCanvas;
 using WebKit::WebFrame;
 using WebKit::WebPrivatePtr;
-using WebKit::WebRenderingStats;
 using WebKit::WebSize;
 using WebKit::WebView;
 using WebKit::WebViewBenchmarkSupport;
@@ -152,30 +151,40 @@ class GpuBenchmarkingWrapper : public v8::Extension {
     if (!render_view_impl)
       return v8::Undefined();
 
-    WebRenderingStats stats;
+    webkit_glue::CompositorRenderingStats stats;
     render_view_impl->GetRenderingStats(stats);
 
     content::GpuRenderingStats gpu_stats;
     render_view_impl->GetGpuRenderingStats(&gpu_stats);
+
     v8::Handle<v8::Object> stats_object = v8::Object::New();
-    stats_object->Set(v8::String::New("numAnimationFrames"),
-                      v8::Integer::New(stats.numAnimationFrames));
-    stats_object->Set(v8::String::New("numFramesSentToScreen"),
-                      v8::Integer::New(stats.numFramesSentToScreen));
-    stats_object->Set(v8::String::New("droppedFrameCount"),
-                      v8::Integer::New(stats.droppedFrameCount));
-    stats_object->Set(v8::String::New("totalPaintTimeInSeconds"),
-                      v8::Number::New(stats.totalPaintTimeInSeconds));
-    stats_object->Set(v8::String::New("totalRasterizeTimeInSeconds"),
-                      v8::Number::New(stats.totalRasterizeTimeInSeconds));
-    stats_object->Set(v8::String::New("totalCommitTimeInSeconds"),
-                      v8::Number::New(stats.totalCommitTimeInSeconds));
-    stats_object->Set(v8::String::New("totalCommitCount"),
-                      v8::Integer::New(stats.totalCommitCount));
-    stats_object->Set(v8::String::New("numImplThreadScrolls"),
-                      v8::Integer::New(stats.numImplThreadScrolls));
-    stats_object->Set(v8::String::New("numMainThreadScrolls"),
-                      v8::Integer::New(stats.numMainThreadScrolls));
+    stats_object->Set(
+        v8::String::New("numAnimationFrames"),
+        v8::Integer::New(stats.cc_stats.numAnimationFrames));
+    stats_object->Set(
+        v8::String::New("numFramesSentToScreen"),
+        v8::Integer::New(stats.cc_stats.numFramesSentToScreen));
+    stats_object->Set(
+        v8::String::New("droppedFrameCount"),
+        v8::Integer::New(stats.cc_stats.droppedFrameCount));
+    stats_object->Set(
+        v8::String::New("totalPaintTimeInSeconds"),
+        v8::Number::New(stats.cc_stats.totalPaintTimeInSeconds));
+    stats_object->Set(
+        v8::String::New("totalRasterizeTimeInSeconds"),
+        v8::Number::New(stats.cc_stats.totalRasterizeTimeInSeconds));
+    stats_object->Set(
+        v8::String::New("totalCommitTimeInSeconds"),
+        v8::Number::New(stats.cc_stats.totalCommitTimeInSeconds));
+    stats_object->Set(
+        v8::String::New("totalCommitCount"),
+        v8::Integer::New(stats.cc_stats.totalCommitCount));
+    stats_object->Set(
+        v8::String::New("numImplThreadScrolls"),
+        v8::Integer::New(stats.cc_stats.numImplThreadScrolls));
+    stats_object->Set(
+        v8::String::New("numMainThreadScrolls"),
+        v8::Integer::New(stats.cc_stats.numMainThreadScrolls));
 
     stats_object->Set(v8::String::New("globalTextureUploadCount"),
                       v8::Number::New(gpu_stats.global_texture_upload_count));