Change the web preferences for cursive and fantasy from 'Apple Chancery' and 'Papyrus' to

'Comic Sans MS' and 'Impact' in test_shell.cc
They're selected not because they're the best for cursive and fantasy but because they come with Windows 
without MS Office or other programs installed. 

Papyrus ('fantasy') and Script (a good candidate for 'cursive') are only 
available with MS Office installed. 'Apple Chancery' is not available on Windows and our expected results were bogus
(they're just using the default font).

Rebaseline tests affected by this change (any test that refers to 'cursive' or 'fantasy' fonts). 

Remove papyrus.html and apple-chancery.html and add 'comic-sans-ms.html' and 'impact.html' from chrome/font

Remove *-expected.txt from layout_test_results/v8/chrome/fonts/* and put them along with html files 
in layout_tests/chrome/fonts

Adjust tests_fixable.txt accordingly. 

BUG=2303 
TEST=pass layout tests

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

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

2 files changed, 12 insertions, 6 deletions

diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 3edba44..abf8ecb 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -707,10 +707,6 @@ V8 # LayoutTests/http/tests/navigation/postredirect-basic.html = FAIL | PASS
 // installed to run.
 V8 | KJS # chrome/fast/dom/java-applet-calls.html = FAIL
 
-// These tests don't work if office is not installed. See bug # 2303
-V8 # LayoutTests/css1/font_properties/font_family.html = FAIL | PASS
-V8 # chrome/fonts/papyrus.html = FAIL | PASS
-
 // These tests don't work on the open source buildbot because the font for
 // the "->" char is different. See Bug # 2304
 V8 # LayoutTests/css2.1/t0805-c5518-brdr-t-01-e.html = FAIL | PASS
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index e2f1737..c8164e1 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -234,8 +234,18 @@ void TestShell::ResetWebPreferences() {
         web_prefs_->fixed_font_family = L"Courier";
         web_prefs_->serif_font_family = L"Times";
         web_prefs_->sans_serif_font_family = L"Helvetica";
-        web_prefs_->cursive_font_family = L"Apple Chancery";
-        web_prefs_->fantasy_font_family = L"Papyrus";
+        // 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 
+        //   http://blogs.msdn.com/michkap/archive/2006/04/04/567881.aspx
+        // Some of them are installed only with CJK and complex script
+        // support enabled on Windows XP and are out of consideration here. 
+        // (although we enabled both on our buildbots.)
+        // 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.
+        web_prefs_->cursive_font_family = L"Comic Sans MS";
+        web_prefs_->fantasy_font_family = L"Impact";
         web_prefs_->default_encoding = L"ISO-8859-1";
         web_prefs_->default_font_size = 16;
         web_prefs_->default_fixed_font_size = 13;