Revert "Use WebRenderingStats::Enumerate to populate benchmarking extension renderingStats() fields…

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/file_path.h"
 #include "base/file_util.h"
@@ skipping 63 matching lines @@
     DCHECK(file.isValid());
     picture_.serialize(&file);
   }
 
  private:
   FilePath dirpath_;
   int layer_id_;
   SkPicture picture_;
 };
 
-class RenderingStatsEnumerator
-  : public WebRenderingStats::Enumerator,
-    public content::GpuRenderingStats::Enumerator {
- public:
-  RenderingStatsEnumerator(v8::Handle<v8::Object> stats_object)
-      : stats_object_(stats_object) { }
-
-  virtual void addInt(const char* name, int value) {
-    stats_object_->Set(v8::String::New(name), v8::Integer::New(value));
-  }
-
-  virtual void addDouble(const char* name, double value) {
-    stats_object_->Set(v8::String::New(name), v8::Number::New(value));
-  }
-
-  virtual void addTimeDelta(const char* name, base::TimeDelta value) {
-    stats_object_->Set(v8::String::New(name),
-                       v8::Number::New(value.InSecondsF()));
-  }
-
- private:
-  v8::Handle<v8::Object> stats_object_;
-};
-
 }  // namespace
 
 namespace content {
 
 class GpuBenchmarkingWrapper : public v8::Extension {
  public:
   GpuBenchmarkingWrapper() :
       v8::Extension(kGpuBenchmarkingExtensionName,
           "if (typeof(chrome) == 'undefined') {"
           "  chrome = {};"
@@ skipping 69 matching lines @@
 
     RenderViewImpl* render_view_impl = RenderViewImpl::FromWebView(web_view);
     if (!render_view_impl)
       return v8::Undefined();
 
     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));
+    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));

[brianderson, 2012/10/19 18:54:31]

A straight up revert compiles, but leaves out implThreadScrollCount and
mainThreadScrollCount which have been added recently. Will resolve this in next
patch and double check the gpu_stats as well.

 
-    v8::Handle<v8::Object> stats_object = v8::Object::New();
-    RenderingStatsEnumerator enumerator(stats_object);
-    stats.enumerateFields(&enumerator);
-    gpu_stats.enumerateFields(&enumerator);
+    stats_object->Set(v8::String::New("globalTextureUploadCount"),
+                      v8::Number::New(gpu_stats.global_texture_upload_count));
+    stats_object->Set(
+        v8::String::New("globalTotalTextureUploadTimeInSeconds"),
+        v8::Number::New(
+            gpu_stats.global_total_texture_upload_time.InSecondsF()));
+    stats_object->Set(v8::String::New("textureUploadCount"),
+                      v8::Number::New(gpu_stats.texture_upload_count));
+    stats_object->Set(
+        v8::String::New("totalTextureUploadTimeInSeconds"),
+        v8::Number::New(gpu_stats.total_texture_upload_time.InSecondsF()));
+    stats_object->Set(
+        v8::String::New("globalTotalProcessingCommandsTimeInSeconds"),
+        v8::Number::New(
+            gpu_stats.global_total_processing_commands_time.InSecondsF()));
+    stats_object->Set(
+        v8::String::New("totalProcessingCommandsTimeInSeconds"),
+        v8::Number::New(
+            gpu_stats.total_processing_commands_time.InSecondsF()));
     return stats_object;
   }
 
   static v8::Handle<v8::Value> PrintToSkPicture(const v8::Arguments& args) {
     if (args.Length() != 1)
       return v8::Undefined();
 
     v8::String::AsciiValue dirname(args[0]);
     if (dirname.length() == 0)
       return v8::Undefined();
@@ skipping 161 matching lines @@
 
     return results;
   }
 };
 
 v8::Extension* GpuBenchmarkingExtension::Get() {
   return new GpuBenchmarkingWrapper();
 }
 
 }  // namespace content