Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2289)

Unified Diff: content/shell/webkit_test_runner_bindings.cc

Issue 10941011: Rewrite layout_browsertests to use content_shell --dump-render-tree to execute layout tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/webkit_test_runner_bindings.cc
diff --git a/content/shell/webkit_test_runner_bindings.cc b/content/shell/webkit_test_runner_bindings.cc
index e91f162d2c9d3113cae886f8ef98310b269be431..6d1eb6f1bd944c32bbc1289d2c87e696220e3dfb 100644
--- a/content/shell/webkit_test_runner_bindings.cc
+++ b/content/shell/webkit_test_runner_bindings.cc
@@ -10,11 +10,13 @@
#include "grit/shell_resources.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/WebWorkerInfo.h"
#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
using WebKit::WebFrame;
using WebKit::WebView;
+using WebKit::WebWorkerInfo;
namespace content {
@@ -99,6 +101,20 @@ v8::Handle<v8::Value> SetWaitUntilDone(const v8::Arguments& args) {
return v8::Undefined();
}
+v8::Handle<v8::Value> GetWorkerThreadCount(const v8::Arguments& args) {
+ RenderView* view = GetCurrentRenderView();
+ if (!view)
+ return v8::Undefined();
+
+ return v8::Integer::NewFromUnsigned(WebWorkerInfo::dedicatedWorkerCount());
+}
+
+v8::Handle<v8::Value> OverridePreference(const v8::Arguments& args) {
+ // Not implemented, but playing nicely for now, so we can run
+ // layout_browsertests.
+ return v8::Undefined();
+}
+
v8::Handle<v8::Value> NotImplemented(const v8::Arguments& args) {
RenderView* view = GetCurrentRenderView();
if (!view)
@@ -146,6 +162,10 @@ WebKitTestRunnerBindings::GetNativeFunction(v8::Handle<v8::String> name) {
}
if (name->Equals(v8::String::New("SetWaitUntilDone")))
return v8::FunctionTemplate::New(SetWaitUntilDone);
+ if (name->Equals(v8::String::New("GetWorkerThreadCount")))
+ return v8::FunctionTemplate::New(GetWorkerThreadCount);
+ if (name->Equals(v8::String::New("OverridePreference")))
+ return v8::FunctionTemplate::New(OverridePreference);
if (name->Equals(v8::String::New("NotImplemented")))
return v8::FunctionTemplate::New(NotImplemented);

Powered by Google App Engine
This is Rietveld 408576698