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

Side by Side Diff: webkit/tools/test_shell/test_shell.cc

Issue 149086: Use upstream V8Proxy and V8Utilities (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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
« no previous file with comments | « webkit/port/bindings/v8/v8_utility.h ('k') | webkit/webkit.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "v8_proxy.h" 5 #include "V8Proxy.h"
6 #undef LOG 6 #undef LOG
7 7
8 #include "webkit/tools/test_shell/test_shell.h" 8 #include "webkit/tools/test_shell/test_shell.h"
9 9
10 #include "base/base_paths.h" 10 #include "base/base_paths.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/debug_on_start.h" 12 #include "base/debug_on_start.h"
13 #include "base/file_path.h" 13 #include "base/file_path.h"
14 #include "base/file_util.h" 14 #include "base/file_util.h"
15 #include "base/gfx/png_encoder.h" 15 #include "base/gfx/png_encoder.h"
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 static void UnitTestAssertHandler(const std::string& str) { 176 static void UnitTestAssertHandler(const std::string& str) {
177 FAIL() << str; 177 FAIL() << str;
178 } 178 }
179 179
180 // static 180 // static
181 void TestShell::Dump(TestShell* shell) { 181 void TestShell::Dump(TestShell* shell) {
182 const TestParams* params = NULL; 182 const TestParams* params = NULL;
183 if ((shell == NULL) || ((params = shell->test_params()) == NULL)) 183 if ((shell == NULL) || ((params = shell->test_params()) == NULL))
184 return; 184 return;
185 185
186 WebCore::V8Proxy::ProcessConsoleMessages(); 186 WebCore::V8Proxy::processConsoleMessages();
187 // Echo the url in the output so we know we're not getting out of sync. 187 // Echo the url in the output so we know we're not getting out of sync.
188 printf("#URL:%s\n", params->test_url.c_str()); 188 printf("#URL:%s\n", params->test_url.c_str());
189 189
190 // Dump the requested representation. 190 // Dump the requested representation.
191 WebFrame* frame = shell->webView()->GetMainFrame(); 191 WebFrame* frame = shell->webView()->GetMainFrame();
192 if (frame) { 192 if (frame) {
193 bool should_dump_as_text = 193 bool should_dump_as_text =
194 shell->layout_test_controller_->ShouldDumpAsText(); 194 shell->layout_test_controller_->ShouldDumpAsText();
195 bool dumped_anything = false; 195 bool dumped_anything = false;
196 if (params->dump_tree) { 196 if (params->dump_tree) {
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 } 668 }
669 #endif // OS_WIN 669 #endif // OS_WIN
670 return false; 670 return false;
671 } 671 }
672 672
673 std::wstring GetWebKitLocale() { 673 std::wstring GetWebKitLocale() {
674 return L"en-US"; 674 return L"en-US";
675 } 675 }
676 676
677 } // namespace webkit_glue 677 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/port/bindings/v8/v8_utility.h ('k') | webkit/webkit.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698