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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/webkit_test_runner_bindings.h" 5 #include "content/shell/webkit_test_runner_bindings.h"
6 6
7 #include "base/string_piece.h" 7 #include "base/string_piece.h"
8 #include "content/public/renderer/render_view.h" 8 #include "content/public/renderer/render_view.h"
9 #include "content/shell/shell_messages.h" 9 #include "content/shell/shell_messages.h"
10 #include "grit/shell_resources.h" 10 #include "grit/shell_resources.h"
11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerInfo.h"
13 #include "ui/base/layout.h" 14 #include "ui/base/layout.h"
14 #include "ui/base/resource/resource_bundle.h" 15 #include "ui/base/resource/resource_bundle.h"
15 16
16 using WebKit::WebFrame; 17 using WebKit::WebFrame;
17 using WebKit::WebView; 18 using WebKit::WebView;
19 using WebKit::WebWorkerInfo;
18 20
19 namespace content { 21 namespace content {
20 22
21 namespace { 23 namespace {
22 24
23 base::StringPiece GetStringResource(int resource_id) { 25 base::StringPiece GetStringResource(int resource_id) {
24 return ResourceBundle::GetSharedInstance().GetRawDataResource( 26 return ResourceBundle::GetSharedInstance().GetRawDataResource(
25 resource_id, ui::SCALE_FACTOR_NONE); 27 resource_id, ui::SCALE_FACTOR_NONE);
26 } 28 }
27 29
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 94
93 v8::Handle<v8::Value> SetWaitUntilDone(const v8::Arguments& args) { 95 v8::Handle<v8::Value> SetWaitUntilDone(const v8::Arguments& args) {
94 RenderView* view = GetCurrentRenderView(); 96 RenderView* view = GetCurrentRenderView();
95 if (!view) 97 if (!view)
96 return v8::Undefined(); 98 return v8::Undefined();
97 99
98 view->Send(new ShellViewHostMsg_WaitUntilDone(view->GetRoutingID())); 100 view->Send(new ShellViewHostMsg_WaitUntilDone(view->GetRoutingID()));
99 return v8::Undefined(); 101 return v8::Undefined();
100 } 102 }
101 103
104 v8::Handle<v8::Value> GetWorkerThreadCount(const v8::Arguments& args) {
105 RenderView* view = GetCurrentRenderView();
106 if (!view)
107 return v8::Undefined();
108
109 return v8::Integer::NewFromUnsigned(WebWorkerInfo::dedicatedWorkerCount());
110 }
111
112 v8::Handle<v8::Value> OverridePreference(const v8::Arguments& args) {
113 // Not implemented, but playing nicely for now, so we can run
114 // layout_browsertests.
115 return v8::Undefined();
116 }
117
102 v8::Handle<v8::Value> NotImplemented(const v8::Arguments& args) { 118 v8::Handle<v8::Value> NotImplemented(const v8::Arguments& args) {
103 RenderView* view = GetCurrentRenderView(); 119 RenderView* view = GetCurrentRenderView();
104 if (!view) 120 if (!view)
105 return v8::Undefined(); 121 return v8::Undefined();
106 122
107 if (args.Length() != 2 || !args[0]->IsString() || !args[1]->IsString()) 123 if (args.Length() != 2 || !args[0]->IsString() || !args[1]->IsString())
108 return v8::Undefined(); 124 return v8::Undefined();
109 125
110 view->Send(new ShellViewHostMsg_NotImplemented( 126 view->Send(new ShellViewHostMsg_NotImplemented(
111 view->GetRoutingID(), 127 view->GetRoutingID(),
(...skipping 27 matching lines...) Expand all
139 return v8::FunctionTemplate::New(SetDumpChildFramesAsText); 155 return v8::FunctionTemplate::New(SetDumpChildFramesAsText);
140 if (name->Equals(v8::String::New("SetPrinting"))) 156 if (name->Equals(v8::String::New("SetPrinting")))
141 return v8::FunctionTemplate::New(SetPrinting); 157 return v8::FunctionTemplate::New(SetPrinting);
142 if (name->Equals(v8::String::New( 158 if (name->Equals(v8::String::New(
143 "SetShouldStayOnPageAfterHandlingBeforeUnload"))) { 159 "SetShouldStayOnPageAfterHandlingBeforeUnload"))) {
144 return v8::FunctionTemplate::New( 160 return v8::FunctionTemplate::New(
145 SetShouldStayOnPageAfterHandlingBeforeUnload); 161 SetShouldStayOnPageAfterHandlingBeforeUnload);
146 } 162 }
147 if (name->Equals(v8::String::New("SetWaitUntilDone"))) 163 if (name->Equals(v8::String::New("SetWaitUntilDone")))
148 return v8::FunctionTemplate::New(SetWaitUntilDone); 164 return v8::FunctionTemplate::New(SetWaitUntilDone);
165 if (name->Equals(v8::String::New("GetWorkerThreadCount")))
166 return v8::FunctionTemplate::New(GetWorkerThreadCount);
167 if (name->Equals(v8::String::New("OverridePreference")))
168 return v8::FunctionTemplate::New(OverridePreference);
149 if (name->Equals(v8::String::New("NotImplemented"))) 169 if (name->Equals(v8::String::New("NotImplemented")))
150 return v8::FunctionTemplate::New(NotImplemented); 170 return v8::FunctionTemplate::New(NotImplemented);
151 171
152 NOTREACHED(); 172 NOTREACHED();
153 return v8::FunctionTemplate::New(); 173 return v8::FunctionTemplate::New();
154 } 174 }
155 175
156 } // namespace content 176 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698