summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/test_shell.cc
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-15 20:29:29 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-15 20:29:29 +0000
commit4383fb67b470c15f815a45a0ed55da075bfd8040 (patch)
treeb40f6181d72aa92664a600b541b97dba9f77f191 /webkit/tools/test_shell/test_shell.cc
parentd82443b8abc227bd9aa383bfc62702cf36c97476 (diff)
downloadchromium_src-4383fb67b470c15f815a45a0ed55da075bfd8040.zip
chromium_src-4383fb67b470c15f815a45a0ed55da075bfd8040.tar.gz
chromium_src-4383fb67b470c15f815a45a0ed55da075bfd8040.tar.bz2
Changes the backing font from Times to 'times new roman'. This matches
earlier change (http://codereview.chromium.org/12457) that changed another place from Times to 'times new roman'. BUG=none TEST=none Review URL: http://codereview.chromium.org/18099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell.cc')
-rw-r--r--webkit/tools/test_shell/test_shell.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 48c24bfb..7ffacdf 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -284,12 +284,17 @@ void TestShell::SetAllowScriptsToCloseWindows() {
void TestShell::ResetWebPreferences() {
DCHECK(web_prefs_);
- // Match the settings used by Mac DumpRenderTree.
+ // Match the settings used by Mac DumpRenderTree, with the exception of
+ // fonts.
if (web_prefs_) {
*web_prefs_ = WebPreferences();
- web_prefs_->standard_font_family = L"Times";
+ // 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";
- web_prefs_->serif_font_family = L"Times";
+ // NOTE: case matters here, this must be 'times new roman', else some
+ // layout tests fail.
+ web_prefs_->serif_font_family = L"times new roman";
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 :