summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-16 19:29:07 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-16 19:29:07 +0000
commit8cf67c84d8e530031755c32dc947a0d9415330a6 (patch)
treea6fd339e544dfd38eed17d276252683c8f2992ed
parent5632b20d30724f87743ea9aa225f207dd94188ed (diff)
downloadchromium_src-8cf67c84d8e530031755c32dc947a0d9415330a6.zip
chromium_src-8cf67c84d8e530031755c32dc947a0d9415330a6.tar.gz
chromium_src-8cf67c84d8e530031755c32dc947a0d9415330a6.tar.bz2
Use Times, sans New Roman, for layout tests on Mac
Review URL: http://codereview.chromium.org/18163 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8196 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/test_shell/test_shell.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 7ffacdf..fac10d6 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -288,13 +288,15 @@ void TestShell::ResetWebPreferences() {
// fonts.
if (web_prefs_) {
*web_prefs_ = WebPreferences();
- // NOTE: case matters here, this must be 'times new roman', else some
- // layout tests fail.
- web_prefs_->standard_font_family = L"times new roman";
- web_prefs_->fixed_font_family = L"Courier";
+#if defined(OS_MACOSX)
+ web_prefs_->serif_font_family = L"Times";
+#else
// NOTE: case matters here, this must be 'times new roman', else some
// layout tests fail.
web_prefs_->serif_font_family = L"times new roman";
+#endif
+ web_prefs_->standard_font_family = web_prefs_->serif_font_family;
+ web_prefs_->fixed_font_family = L"Courier";
web_prefs_->sans_serif_font_family = L"Helvetica";
// These two fonts are picked from the intersection of
// Win XP font list and Vista font list :