| OLD | NEW |
| 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 // TODO(dumi): expose V8Proxy::processConsoleMessages() through | |
| 6 // a function in WebKit.h and remove the next 2 includes | |
| 7 // http://code.google.com/p/chromium/issues/detail?id=17300 | |
| 8 #include "config.h" | |
| 9 #include "V8Proxy.h" | |
| 10 #undef LOG | 5 #undef LOG |
| 11 | 6 |
| 12 #include "webkit/tools/test_shell/test_shell.h" | 7 #include "webkit/tools/test_shell/test_shell.h" |
| 13 | 8 |
| 14 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
| 15 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 16 #include "base/debug_on_start.h" | 11 #include "base/debug_on_start.h" |
| 17 #include "base/file_path.h" | 12 #include "base/file_path.h" |
| 18 #include "base/file_util.h" | 13 #include "base/file_util.h" |
| 19 #include "base/gfx/png_encoder.h" | 14 #include "base/gfx/png_encoder.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 30 #include "build/build_config.h" | 25 #include "build/build_config.h" |
| 31 #include "googleurl/src/url_util.h" | 26 #include "googleurl/src/url_util.h" |
| 32 #include "grit/webkit_strings.h" | 27 #include "grit/webkit_strings.h" |
| 33 #include "net/base/mime_util.h" | 28 #include "net/base/mime_util.h" |
| 34 #include "net/url_request/url_request_file_job.h" | 29 #include "net/url_request/url_request_file_job.h" |
| 35 #include "net/url_request/url_request_filter.h" | 30 #include "net/url_request/url_request_filter.h" |
| 36 #include "skia/ext/bitmap_platform_device.h" | 31 #include "skia/ext/bitmap_platform_device.h" |
| 37 #include "testing/gtest/include/gtest/gtest.h" | 32 #include "testing/gtest/include/gtest/gtest.h" |
| 38 #include "third_party/skia/include/core/SkBitmap.h" | 33 #include "third_party/skia/include/core/SkBitmap.h" |
| 39 #include "webkit/api/public/WebRect.h" | 34 #include "webkit/api/public/WebRect.h" |
| 35 #include "webkit/api/public/WebKit.h" |
| 40 #include "webkit/api/public/WebSize.h" | 36 #include "webkit/api/public/WebSize.h" |
| 41 #include "webkit/api/public/WebString.h" | 37 #include "webkit/api/public/WebString.h" |
| 42 #include "webkit/api/public/WebURL.h" | 38 #include "webkit/api/public/WebURL.h" |
| 43 #include "webkit/api/public/WebURLRequest.h" | 39 #include "webkit/api/public/WebURLRequest.h" |
| 44 #include "webkit/api/public/WebURLResponse.h" | 40 #include "webkit/api/public/WebURLResponse.h" |
| 45 #include "webkit/glue/glue_serialize.h" | 41 #include "webkit/glue/glue_serialize.h" |
| 46 #include "webkit/glue/webframe.h" | 42 #include "webkit/glue/webframe.h" |
| 47 #include "webkit/glue/webkit_glue.h" | 43 #include "webkit/glue/webkit_glue.h" |
| 48 #include "webkit/glue/webpreferences.h" | 44 #include "webkit/glue/webpreferences.h" |
| 49 #include "webkit/glue/webview.h" | 45 #include "webkit/glue/webview.h" |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 static void UnitTestAssertHandler(const std::string& str) { | 177 static void UnitTestAssertHandler(const std::string& str) { |
| 182 FAIL() << str; | 178 FAIL() << str; |
| 183 } | 179 } |
| 184 | 180 |
| 185 // static | 181 // static |
| 186 void TestShell::Dump(TestShell* shell) { | 182 void TestShell::Dump(TestShell* shell) { |
| 187 const TestParams* params = NULL; | 183 const TestParams* params = NULL; |
| 188 if ((shell == NULL) || ((params = shell->test_params()) == NULL)) | 184 if ((shell == NULL) || ((params = shell->test_params()) == NULL)) |
| 189 return; | 185 return; |
| 190 | 186 |
| 191 WebCore::V8Proxy::processConsoleMessages(); | 187 WebKit::flushConsoleMessages(); |
| 192 // Echo the url in the output so we know we're not getting out of sync. | 188 // Echo the url in the output so we know we're not getting out of sync. |
| 193 printf("#URL:%s\n", params->test_url.c_str()); | 189 printf("#URL:%s\n", params->test_url.c_str()); |
| 194 | 190 |
| 195 // Dump the requested representation. | 191 // Dump the requested representation. |
| 196 WebFrame* frame = shell->webView()->GetMainFrame(); | 192 WebFrame* frame = shell->webView()->GetMainFrame(); |
| 197 if (frame) { | 193 if (frame) { |
| 198 bool should_dump_as_text = | 194 bool should_dump_as_text = |
| 199 shell->layout_test_controller_->ShouldDumpAsText(); | 195 shell->layout_test_controller_->ShouldDumpAsText(); |
| 200 bool dumped_anything = false; | 196 bool dumped_anything = false; |
| 201 if (params->dump_tree) { | 197 if (params->dump_tree) { |
| (...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 674 | 670 |
| 675 void CloseIdleConnections() { | 671 void CloseIdleConnections() { |
| 676 // Used in benchmarking, Ignored for test_shell. | 672 // Used in benchmarking, Ignored for test_shell. |
| 677 } | 673 } |
| 678 | 674 |
| 679 void SetCacheMode(bool enabled) { | 675 void SetCacheMode(bool enabled) { |
| 680 // Used in benchmarking, Ignored for test_shell. | 676 // Used in benchmarking, Ignored for test_shell. |
| 681 } | 677 } |
| 682 | 678 |
| 683 } // namespace webkit_glue | 679 } // namespace webkit_glue |
| OLD | NEW |