Report texture upload time in renderingStats.

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 744ecfe528eaf6b43bc41b849a756b53186ec93a..4997034b91b882f451785d3640c15f2103a06e34 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 "content/public/common/gpu_rendering_stats.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/all_rendering_benchmarks.h"
 #include "content/renderer/render_view_impl.h"
@@ -151,6 +152,9 @@ class GpuBenchmarkingWrapper : public v8::Extension {
     WebRenderingStats 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));
@@ -162,6 +166,16 @@ class GpuBenchmarkingWrapper : public v8::Extension {
                       v8::Number::New(stats.totalPaintTimeInSeconds));
     stats_object->Set(v8::String::New("totalRasterizeTimeInSeconds"),
                       v8::Number::New(stats.totalRasterizeTimeInSeconds));
+    stats_object->Set(v8::String::New("globalTextureUploadCount"),
+                      v8::Number::New(gpu_stats.globalTextureUploadCount));
+    stats_object->Set(v8::String::New("globalTotalTextureUploadTimeInSeconds"),
+                      v8::Number::New(
+                          gpu_stats.globalTotalTextureUploadTimeInSeconds));
+    stats_object->Set(v8::String::New("textureUploadCount"),
+                      v8::Number::New(gpu_stats.textureUploadCount));
+    stats_object->Set(v8::String::New("totalTextureUploadTimeInSeconds"),
+                      v8::Number::New(
+                          gpu_stats.totalTextureUploadTimeInSeconds));
     return stats_object;
   }