| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 #undef LOG | 5 #undef LOG |
| 6 | 6 |
| 7 #include "webkit/tools/test_shell/test_shell.h" | 7 #include "webkit/tools/test_shell/test_shell.h" |
| 8 | 8 |
| 9 #include "app/gfx/codec/png_codec.h" | 9 #include "app/gfx/codec/png_codec.h" |
| 10 #include "base/base_paths.h" | 10 #include "base/base_paths.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 #include "webkit/api/public/WebAccessibilityObject.h" | 34 #include "webkit/api/public/WebAccessibilityObject.h" |
| 35 #include "webkit/api/public/WebFrame.h" | 35 #include "webkit/api/public/WebFrame.h" |
| 36 #include "webkit/api/public/WebKit.h" | 36 #include "webkit/api/public/WebKit.h" |
| 37 #include "webkit/api/public/WebScriptController.h" | 37 #include "webkit/api/public/WebScriptController.h" |
| 38 #include "webkit/api/public/WebRect.h" | 38 #include "webkit/api/public/WebRect.h" |
| 39 #include "webkit/api/public/WebSize.h" | 39 #include "webkit/api/public/WebSize.h" |
| 40 #include "webkit/api/public/WebString.h" | 40 #include "webkit/api/public/WebString.h" |
| 41 #include "webkit/api/public/WebURL.h" | 41 #include "webkit/api/public/WebURL.h" |
| 42 #include "webkit/api/public/WebURLRequest.h" | 42 #include "webkit/api/public/WebURLRequest.h" |
| 43 #include "webkit/api/public/WebURLResponse.h" | 43 #include "webkit/api/public/WebURLResponse.h" |
| 44 #include "webkit/api/public/WebView.h" |
| 44 #include "webkit/glue/glue_serialize.h" | 45 #include "webkit/glue/glue_serialize.h" |
| 45 #include "webkit/glue/webkit_glue.h" | 46 #include "webkit/glue/webkit_glue.h" |
| 46 #include "webkit/glue/webpreferences.h" | 47 #include "webkit/glue/webpreferences.h" |
| 47 #include "webkit/glue/webview.h" | |
| 48 #include "webkit/tools/test_shell/accessibility_controller.h" | 48 #include "webkit/tools/test_shell/accessibility_controller.h" |
| 49 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" | 49 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" |
| 50 #include "webkit/tools/test_shell/test_navigation_controller.h" | 50 #include "webkit/tools/test_shell/test_navigation_controller.h" |
| 51 #include "webkit/tools/test_shell/test_shell_switches.h" | 51 #include "webkit/tools/test_shell/test_shell_switches.h" |
| 52 | 52 |
| 53 using WebKit::WebCanvas; | 53 using WebKit::WebCanvas; |
| 54 using WebKit::WebFrame; | 54 using WebKit::WebFrame; |
| 55 using WebKit::WebNavigationPolicy; | 55 using WebKit::WebNavigationPolicy; |
| 56 using WebKit::WebRect; | 56 using WebKit::WebRect; |
| 57 using WebKit::WebSize; | 57 using WebKit::WebSize; |
| 58 using WebKit::WebURLRequest; | 58 using WebKit::WebURLRequest; |
| 59 using WebKit::WebView; |
| 59 | 60 |
| 60 namespace { | 61 namespace { |
| 61 | 62 |
| 62 // Default timeout in ms for file page loads when in layout test mode. | 63 // Default timeout in ms for file page loads when in layout test mode. |
| 63 const int kDefaultFileTestTimeoutMillisecs = 10 * 1000; | 64 const int kDefaultFileTestTimeoutMillisecs = 10 * 1000; |
| 64 | 65 |
| 65 // Content area size for newly created windows. | 66 // Content area size for newly created windows. |
| 66 const int kTestWindowWidth = 800; | 67 const int kTestWindowWidth = 800; |
| 67 const int kTestWindowHeight = 600; | 68 const int kTestWindowHeight = 600; |
| 68 | 69 |
| (...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 691 | 692 |
| 692 void CloseIdleConnections() { | 693 void CloseIdleConnections() { |
| 693 // Used in benchmarking, Ignored for test_shell. | 694 // Used in benchmarking, Ignored for test_shell. |
| 694 } | 695 } |
| 695 | 696 |
| 696 void SetCacheMode(bool enabled) { | 697 void SetCacheMode(bool enabled) { |
| 697 // Used in benchmarking, Ignored for test_shell. | 698 // Used in benchmarking, Ignored for test_shell. |
| 698 } | 699 } |
| 699 | 700 |
| 700 } // namespace webkit_glue | 701 } // namespace webkit_glue |
| OLD | NEW |