diff options
Diffstat (limited to 'webkit')
| -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( |