summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-26 19:15:54 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-26 19:15:54 +0000
commit33124014399f72fe1e780e7a9b12505d3a840b6b (patch)
tree1c764066a7edbab52d40f7c79bc76352f766fc49
parent6b2785f64635b9371b37f8bf5dc315e687fbca8f (diff)
downloadchromium_src-33124014399f72fe1e780e7a9b12505d3a840b6b.zip
chromium_src-33124014399f72fe1e780e7a9b12505d3a840b6b.tar.gz
chromium_src-33124014399f72fe1e780e7a9b12505d3a840b6b.tar.bz2
Do no use custom gtkrc files in layout test mode.
On desktop environments like KDE, custom gtkrc files prevent test shell from setting the theme correctly. Review URL: http://codereview.chromium.org/18769 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8649 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/test_shell/test_shell_platform_delegate_gtk.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell_platform_delegate_gtk.cc b/webkit/tools/test_shell/test_shell_platform_delegate_gtk.cc
index 8846f19..52b1d49 100644
--- a/webkit/tools/test_shell/test_shell_platform_delegate_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_platform_delegate_gtk.cc
@@ -14,6 +14,11 @@ void TestShellPlatformDelegate::PreflightArgs(int *argc, char ***argv) {
}
void TestShellPlatformDelegate::SelectUnifiedTheme() {
+ // Stop custom gtkrc files from messing with the theme.
+ gchar* default_gtkrc_files[] = { NULL };
+ gtk_rc_set_default_files(default_gtkrc_files);
+ gtk_rc_reparse_all_for_settings(gtk_settings_get_default(), TRUE);
+
// 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.