Fix TestShell fonts again (see r8206, r8198, r8196, r8113)

Review URL: http://codereview.chromium.org/18165

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8207 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 9 deletions

diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index adb963b..3c5d15a 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -354,16 +354,16 @@ void TestShell::ResetWebPreferences() {
     // fonts.
     if (web_prefs_) {
         *web_prefs_ = WebPreferences();
+
 #if defined(OS_MACOSX)
-        web_prefs_->standard_font_family = L"Times";
+        web_prefs_->serif_font_family = L"Times";
+        web_prefs_->cursive_font_family = L"Apple Chancery";
+        web_prefs_->fantasy_font_family = L"Papyrus";
 #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_->fixed_font_family = L"Courier";
-        web_prefs_->serif_font_family = L"Times";
-        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 :
         //   http://www.microsoft.com/typography/fonts/winxp.htm 
@@ -374,13 +374,14 @@ void TestShell::ResetWebPreferences() {
         // They (especially Impact for fantasy) are not typical cursive
         // and fantasy fonts, but it should not matter for layout tests
         // as long as they're available.
-#if defined(OS_MACOSX)
-        web_prefs_->cursive_font_family = L"Apple Chancery";
-        web_prefs_->fantasy_font_family = L"Papyrus";
-#else
         web_prefs_->cursive_font_family = L"Comic Sans MS";
         web_prefs_->fantasy_font_family = L"Impact";
 #endif
+        web_prefs_->standard_font_family = web_prefs_->serif_font_family;
+        web_prefs_->fixed_font_family = L"Courier";
+        web_prefs_->serif_font_family = L"Times";
+        web_prefs_->sans_serif_font_family = L"Helvetica";
+
         web_prefs_->default_encoding = L"ISO-8859-1";
         web_prefs_->default_font_size = 16;
         web_prefs_->default_fixed_font_size = 13;