Fixing RenderingStats vs WebRenderingStats mess

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 201f961f0a71c4fc566d3fbd72a6cf885956b259..e2b4a052be7be6423725adee73d9aa89ce06a6c5 100644
--- a/content/renderer/gpu/gpu_benchmarking_extension.cc
+++ b/content/renderer/gpu/gpu_benchmarking_extension.cc
@@ -10,6 +10,7 @@
 #include "base/file_util.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string_number_conversions.h"
+#include "cc/rendering_stats.h"
 #include "content/common/gpu/gpu_rendering_stats.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/all_rendering_benchmarks.h"
@@ -152,18 +153,22 @@ class GpuBenchmarkingWrapper : public v8::Extension {
     if (!render_view_impl)
       return v8::Undefined();
 
+#ifdef NOT_USING_WEB_RENDERING_STATS
+    cc::RenderingStats stats;
+#else
     WebRenderingStats stats;
+#endif  // NOT_USING_WEB_RENDERING_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));
+                      v8::Number::New(stats.numAnimationFrames));
     stats_object->Set(v8::String::New("numFramesSentToScreen"),
-                      v8::Integer::New(stats.numFramesSentToScreen));
+                      v8::Number::New(stats.numFramesSentToScreen));
     stats_object->Set(v8::String::New("droppedFrameCount"),
-                      v8::Integer::New(stats.droppedFrameCount));
+                      v8::Number::New(stats.droppedFrameCount));
     stats_object->Set(v8::String::New("totalPaintTimeInSeconds"),
                       v8::Number::New(stats.totalPaintTimeInSeconds));
     stats_object->Set(v8::String::New("totalRasterizeTimeInSeconds"),
@@ -171,15 +176,15 @@ class GpuBenchmarkingWrapper : public v8::Extension {
     stats_object->Set(v8::String::New("totalCommitTimeInSeconds"),
                       v8::Number::New(stats.totalCommitTimeInSeconds));
     stats_object->Set(v8::String::New("totalCommitCount"),
-                      v8::Integer::New(stats.totalCommitCount));
+                      v8::Number::New(stats.totalCommitCount));
     stats_object->Set(v8::String::New("numImplThreadScrolls"),
-                      v8::Integer::New(stats.numImplThreadScrolls));
+                      v8::Number::New(stats.numImplThreadScrolls));
     stats_object->Set(v8::String::New("numMainThreadScrolls"),
-                      v8::Integer::New(stats.numMainThreadScrolls));
+                      v8::Number::New(stats.numMainThreadScrolls));
     stats_object->Set(v8::String::New("totalPixelsPainted"),
-                      v8::Integer::New(stats.totalPixelsPainted));
+                      v8::Number::New(stats.totalPixelsPainted));
     stats_object->Set(v8::String::New("totalPixelsRasterized"),
-                      v8::Integer::New(stats.totalPixelsRasterized));
+                      v8::Number::New(stats.totalPixelsRasterized));
 
     stats_object->Set(v8::String::New("globalTextureUploadCount"),
                       v8::Number::New(gpu_stats.global_texture_upload_count));