Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(338)

Side by Side Diff: webkit/tools/test_shell/test_shell.cc

Issue 4341: Change cursive/fantasy fonts in test_shell and rebaseline test results accordingly (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/tools/layout_tests/test_lists/tests_fixable.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <windows.h> 5 #include <windows.h>
6 #include <atlbase.h> 6 #include <atlbase.h>
7 #include <commdlg.h> 7 #include <commdlg.h>
8 #include <objbase.h> 8 #include <objbase.h>
9 #include <shlwapi.h> 9 #include <shlwapi.h>
10 #include <wininet.h> 10 #include <wininet.h>
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 void TestShell::ResetWebPreferences() { 227 void TestShell::ResetWebPreferences() {
228 DCHECK(web_prefs_); 228 DCHECK(web_prefs_);
229 229
230 // Match the settings used by Mac DumpRenderTree. 230 // Match the settings used by Mac DumpRenderTree.
231 if (web_prefs_) { 231 if (web_prefs_) {
232 *web_prefs_ = WebPreferences(); 232 *web_prefs_ = WebPreferences();
233 web_prefs_->standard_font_family = L"Times"; 233 web_prefs_->standard_font_family = L"Times";
234 web_prefs_->fixed_font_family = L"Courier"; 234 web_prefs_->fixed_font_family = L"Courier";
235 web_prefs_->serif_font_family = L"Times"; 235 web_prefs_->serif_font_family = L"Times";
236 web_prefs_->sans_serif_font_family = L"Helvetica"; 236 web_prefs_->sans_serif_font_family = L"Helvetica";
237 web_prefs_->cursive_font_family = L"Apple Chancery"; 237 // These two fonts are picked from the list at
238 web_prefs_->fantasy_font_family = L"Papyrus"; 238 // http://www.microsoft.com/typography/fonts/winxp.htm
239 // enumerating all the fonts available on Windows XP. Some of
eroman 2008/09/29 23:56:32 Are these solid choices for Vista as well?
jungshik at Google 2008/10/03 00:40:29 Yes, they're in the sense that both are available
240 // them are installed only with CJK and Complex script
241 // support enabled and are out of consideration here.
242 // They (especially Impact for fantasy) are not typical cursive
243 // and fantasy fonts, but it should not matter for layout tests
244 // as long as they're available.
245 web_prefs_->cursive_font_family = L"Comic Sans MS";
246 web_prefs_->fantasy_font_family = L"Impact";
239 web_prefs_->default_encoding = L"ISO-8859-1"; 247 web_prefs_->default_encoding = L"ISO-8859-1";
240 web_prefs_->default_font_size = 16; 248 web_prefs_->default_font_size = 16;
241 web_prefs_->default_fixed_font_size = 13; 249 web_prefs_->default_fixed_font_size = 13;
242 web_prefs_->minimum_font_size = 1; 250 web_prefs_->minimum_font_size = 1;
243 web_prefs_->minimum_logical_font_size = 9; 251 web_prefs_->minimum_logical_font_size = 9;
244 web_prefs_->javascript_can_open_windows_automatically = true; 252 web_prefs_->javascript_can_open_windows_automatically = true;
245 web_prefs_->dom_paste_enabled = true; 253 web_prefs_->dom_paste_enabled = true;
246 web_prefs_->developer_extras_enabled = interactive_; 254 web_prefs_->developer_extras_enabled = interactive_;
247 web_prefs_->shrinks_standalone_images_to_fit = false; 255 web_prefs_->shrinks_standalone_images_to_fit = false;
248 web_prefs_->uses_universal_detector = false; 256 web_prefs_->uses_universal_detector = false;
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
1114 bool IsDefaultPluginEnabled() { 1122 bool IsDefaultPluginEnabled() {
1115 return false; 1123 return false;
1116 } 1124 }
1117 1125
1118 std::wstring GetWebKitLocale() { 1126 std::wstring GetWebKitLocale() {
1119 return L"en-US"; 1127 return L"en-US";
1120 } 1128 }
1121 1129
1122 } // namespace webkit_glue 1130 } // namespace webkit_glue
1123 1131
OLDNEW
« no previous file with comments | « webkit/tools/layout_tests/test_lists/tests_fixable.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698