diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-16 19:54:43 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-16 19:54:43 +0000 |
| commit | 6599e5b29f1191fd86944c580e7b8a4cccec3f58 (patch) | |
| tree | 99c3a2bd648e71f1c174baf9fc41409406b5d5c1 /webkit/tools/test_shell/test_shell.cc | |
| parent | 1a3f426f71ee35848e94356dd6bdd423aaff5608 (diff) | |
| download | chromium_src-6599e5b29f1191fd86944c580e7b8a4cccec3f58.zip chromium_src-6599e5b29f1191fd86944c580e7b8a4cccec3f58.tar.gz chromium_src-6599e5b29f1191fd86944c580e7b8a4cccec3f58.tar.bz2 | |
put back the changes that got rolled back.
Review URL: http://codereview.chromium.org/18164
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8206 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell.cc')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index 41bfd4ea..adb963b 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -350,10 +350,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(); +#if defined(OS_MACOSX) web_prefs_->standard_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_->fixed_font_family = L"Courier"; web_prefs_->serif_font_family = L"Times"; web_prefs_->sans_serif_font_family = L"Helvetica"; |