Added rendering benchmark javascript hook

chrome/renderer/benchmarking_extension.cc

 // Copyright (c) 2011 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 "chrome/renderer/benchmarking_extension.h"
 
 #include "base/command_line.h"
 #include "base/metrics/stats_table.h"
 #include "base/time.h"
 #include "chrome/common/benchmarking_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/render_thread.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebRenderingBenchmarkResults.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "v8/include/v8.h"
 
 using WebKit::WebCache;
+using WebKit::WebFrame;
+using WebKit::WebView;
 
 const char kBenchmarkingExtensionName[] = "v8/Benchmarking";
 
+// Benchmark results object that populates a json array

[nduca, 2012/06/12 17:42:09]

Comments end with periods. Also, note its not a json array, its a v8 array. :)

[dmurph, 2012/06/14 02:20:13]

Done.

+class JsonBenchmarkResults : public WebRenderingBenchmarkResults {

[nduca, 2012/06/12 17:42:09]

V8BenchmarkResults

[dmurph, 2012/06/14 02:20:13]

Done.

+ public:
+  explicit JsonBenchmarkResults(v8::Handle<v8::Array> results_array)
+    : curr_result_index_(0), results_array_(results_array) { }

[nduca, 2012/06/12 17:42:09]

check goog c++ style guide, this feels too compact to me but i cant remember

+  virtual ~JsonBenchmarkResults() {}
+
+  void addResult(const char *name, const char* unit, double resultValue) {
+    v8::Handle<v8::Object> result = v8::Object::New();
+    result->Set(v8::String::New("benchmark", 9), v8::String::New(name, -1));
+    result->Set(v8::String::New("unit", 4), v8::String::New(unit, -1));
+    result->Set(v8::String::New("time", 4), v8::Number::New(resultValue));
+    results_array_->Set(curr_result_index_++, result);
+  }
+
+ private:
+  unsigned int curr_result_index_;

[nduca, 2012/06/12 17:42:09]

cur_result_index_. Not sure if this is the standard practice... might look
around for other instances of v8::array to see if you can just do push?

[dmurph, 2012/06/14 02:20:13]

Couldn't find a 'push', but instead of having that variable I just used the
current array size

+  v8::Handle<v8::Array> results_array_;
+};
+
 namespace extensions_v8 {
 
 class BenchmarkingWrapper : public v8::Extension {
  public:
   BenchmarkingWrapper() :
       v8::Extension(kBenchmarkingExtensionName,
         "if (typeof(chrome) == 'undefined') {"
         "  chrome = {};"
         "};"
         "if (typeof(chrome.benchmarking) == 'undefined') {"
@@ skipping 20 matching lines @@
         "  return GetCounter(name);"
         "};"
         "chrome.benchmarking.enableSpdy = function(name) {"
         "  native function EnableSpdy();"
         "  EnableSpdy(name);"
         "};"
         "chrome.benchmarking.isSingleProcess = function() {"
         "  native function IsSingleProcess();"
         "  return IsSingleProcess();"
         "};"
+        "chrome.benchmarking.runRenderingBenchmarks = function() {"
+        "  native function RunRenderingBenchmarks();"
+        "  return RunRenderingBenchmarks();"
+        "};"
         "chrome.Interval = function() {"
         "  var start_ = 0;"
         "  var stop_ = 0;"
         "  native function HiResTime();"
         "  this.start = function() {"
         "    stop_ = 0;"
         "    start_ = HiResTime();"
         "  };"
         "  this.stop = function() {"
         "    stop_ = HiResTime();"
@@ skipping 20 matching lines @@
     } else if (name->Equals(v8::String::New("ClearPredictorCache"))) {
       return v8::FunctionTemplate::New(ClearPredictorCache);
     } else if (name->Equals(v8::String::New("EnableSpdy"))) {
       return v8::FunctionTemplate::New(EnableSpdy);
     } else if (name->Equals(v8::String::New("GetCounter"))) {
       return v8::FunctionTemplate::New(GetCounter);
     } else if (name->Equals(v8::String::New("IsSingleProcess"))) {
       return v8::FunctionTemplate::New(IsSingleProcess);
     } else if (name->Equals(v8::String::New("HiResTime"))) {
       return v8::FunctionTemplate::New(HiResTime);
+    } else if (name->Equals(v8::String::New("RunRenderingBenchmarks"))) {
+      return v8::FunctionTemplate::New(RunRenderingBenchmarks);
     }
 
     return v8::Handle<v8::FunctionTemplate>();
   }
 
   static v8::Handle<v8::Value> CloseConnections(const v8::Arguments& args) {
     content::RenderThread::Get()->Send(
         new ChromeViewHostMsg_CloseCurrentConnections());
     return v8::Undefined();
   }
@@ skipping 50 matching lines @@
 
   static v8::Handle<v8::Value> IsSingleProcess(const v8::Arguments& args) {
     return v8::Boolean::New(
        CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess));
   }
 
   static v8::Handle<v8::Value> HiResTime(const v8::Arguments& args) {
     return v8::Number::New(
         static_cast<double>(base::TimeTicks::HighResNow().ToInternalValue()));
   }
+
+  static v8::Handle<v8::Value> RunRenderingBenchmarks(
+      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();
+
+    v8::Handle<v8::Array> resultsArray = v8::Array::New(0);
+
+    JsonBenchmarkResults* results = new JsonBenchmarkResults(resultsArray);

[nduca, 2012/06/12 17:42:09]

This looks good. But, where did we end up with Darin's alternative design where

web_view has a method BenchmarkController* getBenchmarkController()
where
BenchmarkController {
   // methods for doing different benchmarks, e.g. layout/paintPageToCanvas
}

[dmurph, 2012/06/14 02:20:13]

I'm including it now, I just hadn't made it yet for this patch

+    web_view->runRenderingBenchmarks(*results);
+    delete results;
+
+    return resultsArray;
+  }
 };
 
 v8::Extension* BenchmarkingExtension::Get() {
   return new BenchmarkingWrapper();
 }
 
 }  // namespace extensions_v8