summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 19:44:37 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 19:44:37 +0000
commit6cf0d9c721922df13ead5b6b43192e82a53fe42a (patch)
treeeab51919ce6fde033cdf4e3047f4c783d9631873 /webkit
parent3a1b6b8a9ca6bc86ab13a89ed0e9be5961d7351e (diff)
downloadchromium_src-6cf0d9c721922df13ead5b6b43192e82a53fe42a.zip
chromium_src-6cf0d9c721922df13ead5b6b43192e82a53fe42a.tar.gz
chromium_src-6cf0d9c721922df13ead5b6b43192e82a53fe42a.tar.bz2
Linux test_shell: dont always use hermetic fontconfig mode.
This undoes r42117 as I figured out what was going on. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell_gtk.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index 6e88664..bce9c31 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -181,7 +181,7 @@ void TestShell::InitializeTestShell(bool layout_test_mode) {
// We have fontconfig parse a config file from our resources file. This
// sets a number of aliases ("sans"->"Arial" etc), but doesn't include any
// font directories.
- if (true) {
+ if (layout_test_mode) {
// fontconfig only knows how to load font config configs from a
// file name, so we write to a temp file.
base::StringPiece font_config_xml;