summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/test_shell_mac.mm
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-23 01:47:16 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-23 01:47:16 +0000
commit45fbad0fdf0c83236a997e043805cfade80fc5d8 (patch)
tree1b6010795fefb1664a3e25d705381c5c2dff2a99 /webkit/tools/test_shell/test_shell_mac.mm
parent8dc1411ff5c8dc7e3a1cc2724c77f7ce0193c4ba (diff)
downloadchromium_src-45fbad0fdf0c83236a997e043805cfade80fc5d8.zip
chromium_src-45fbad0fdf0c83236a997e043805cfade80fc5d8.tar.gz
chromium_src-45fbad0fdf0c83236a997e043805cfade80fc5d8.tar.bz2
Add an --allow-external-pages switch to test_shell.
Normally test_shell will not let you load an external URL (like "www.google.com") when running in --layout-tests mode. This is a good thing because it keeps us from writing tests that might have unpredictable results if the external URL changes. However, it would be cool to be able to use the --layout-test infrastructure to capture the rendered/painted page (outside of the actual layout tests run) for QA purposes. This change adds an --allow-external-pages switch to override the check described above. This is kind of a short-term fix. A better fix would be to add a "--headless" flag that loaded and rendered the page and dumped the whole thing, entirely separate from --layout-test mode. I will add that soon. BUG=none TEST=none R=dglazkov Review URL: http://codereview.chromium.org/1748005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell_mac.mm')
-rw-r--r--webkit/tools/test_shell/test_shell_mac.mm6
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 923b5b0..618f91d 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -195,13 +195,15 @@ void TestShell::PlatformShutdown() {
}
// static
-void TestShell::InitializeTestShell(bool layout_test_mode) {
+void TestShell::InitializeTestShell(bool layout_test_mode,
+ bool allow_external_pages) {
// This should move to a per-process platform-specific initialization function
// when one exists.
window_list_ = new WindowList;
layout_test_mode_ = layout_test_mode;
-
+ allow_external_pages_ = allow_external_pages;
+
web_prefs_ = new WebPreferences;
// mmap the data pack which holds strings used by WebCore. This is only