diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 23:32:03 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 23:32:03 +0000 |
| commit | 2b891f9766ac65edd50266a13fcfced4bb036e70 (patch) | |
| tree | 654342e02ba8958f24f0b1c6029b9c8f27dda551 /webkit/tools/test_shell/test_shell_main.cc | |
| parent | 784868b2a5365c664cf52a06c4f51ba60e9ce3eb (diff) | |
| download | chromium_src-2b891f9766ac65edd50266a13fcfced4bb036e70.zip chromium_src-2b891f9766ac65edd50266a13fcfced4bb036e70.tar.gz chromium_src-2b891f9766ac65edd50266a13fcfced4bb036e70.tar.bz2 | |
Force the default GTK theme for layout tests.
Review URL: http://codereview.chromium.org/11456
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell_main.cc')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_main.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index bbe90ef..a24ea7d 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -178,10 +178,18 @@ int main(int argc, char* argv[]) { TestShell::SetAllowScriptsToCloseWindows(); // Disable user themes for layout tests so pixel tests are consistent. + if (!interactive) { #if defined(OS_WIN) - if (!interactive) gfx::NativeTheme::instance()->DisableTheming(); +#elif defined(OS_LINUX) + // Pick a theme that uses Cairo for drawing, since we: + // 1) currently don't support GTK themes that use the GDK drawing APIs, and + // 2) need to use a unified theme for layout tests anyway. + g_object_set(gtk_settings_get_default(), + "gtk-theme-name", "ClearlooksClassic", + NULL); #endif + } if (parsed_command_line.HasSwitch(test_shell::kTestShellTimeOut)) { const std::wstring timeout_str = parsed_command_line.GetSwitchValue( |