Migrate WebKit "global script" font prefs.

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 60 matching lines @@
 
 // Content area size for newly created windows.
 const int kTestWindowWidth = 800;
 const int kTestWindowHeight = 600;
 
 // The W3C SVG layout tests use a different size than the other layout
 // tests.
 const int kSVGTestWindowWidth = 480;
 const int kSVGTestWindowHeight = 360;
 
+const char kWebKitCommonScript[] = "Zyyy";

[darin (slow to review), 2012/04/23 17:00:35]

it seems unfortunate for this magic string to be repeated in more than one .cc
file.

[falken, 2012/04/24 01:27:10]

This patch adds kWebKitCommonScript in pref_names.h, but I'm not sure whether
it's OK for ppapi/shared_impl and test_shell to depend on chrome/common.

+
 // URLRequestTestShellFileJob is used to serve the inspector
 class URLRequestTestShellFileJob : public net::URLRequestFileJob {
  public:
   static net::URLRequestJob* InspectorFactory(net::URLRequest* request,
                                               const std::string& scheme) {
     FilePath path;
     PathService::Get(base::DIR_EXE, &path);
     path = path.AppendASCII("resources");
     path = path.AppendASCII("inspector");
     path = path.AppendASCII(request->url().path().substr(1));
@@ skipping 202 matching lines @@
 // static
 void TestShell::ResetWebPreferences() {
     DCHECK(web_prefs_);
 
     // Match the settings used by Mac DumpRenderTree, with the exception of
     // fonts.
     if (web_prefs_) {
         *web_prefs_ = WebPreferences();
 
 #if defined(OS_MACOSX)
-        web_prefs_->serif_font_family = ASCIIToUTF16("Times");
-        web_prefs_->cursive_font_family = ASCIIToUTF16("Apple Chancery");
-        web_prefs_->fantasy_font_family = ASCIIToUTF16("Papyrus");
+        web_prefs_->serif_font_family_map[kWebKitCommonScript] =
+            ASCIIToUTF16("Times");
+        web_prefs_->cursive_font_family_map[kWebKitCommonScript] =
+            ASCIIToUTF16("Apple Chancery");
+        web_prefs_->fantasy_font_family_map[kWebKitCommonScript] =
+            ASCIIToUTF16("Papyrus");
 #else
         // NOTE: case matters here, this must be 'times new roman', else
         // some layout tests fail.
-        web_prefs_->serif_font_family = ASCIIToUTF16("times new roman");
+        web_prefs_->serif_font_family_map[kWebKitCommonScript] =
+            ASCIIToUTF16("times new roman");
 
         // 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 = ASCIIToUTF16("Comic Sans MS");
-        web_prefs_->fantasy_font_family = ASCIIToUTF16("Impact");
+        web_prefs_->cursive_font_family_map[kWebKitCommonScript] =
+            ASCIIToUTF16("Comic Sans MS");
+        web_prefs_->fantasy_font_family_map[kWebKitCommonScript] =
+            ASCIIToUTF16("Impact");
 #endif
-        web_prefs_->standard_font_family = web_prefs_->serif_font_family;
-        web_prefs_->fixed_font_family = ASCIIToUTF16("Courier");
-        web_prefs_->sans_serif_font_family = ASCIIToUTF16("Helvetica");
+        web_prefs_->standard_font_family_map[kWebKitCommonScript] =
+            web_prefs_->serif_font_family_map[kWebKitCommonScript];
+        web_prefs_->fixed_font_family_map[kWebKitCommonScript] =
+            ASCIIToUTF16("Courier");
+        web_prefs_->sans_serif_font_family_map[kWebKitCommonScript] =
+            ASCIIToUTF16("Helvetica");
 
         web_prefs_->default_encoding = "ISO-8859-1";
         web_prefs_->default_font_size = 16;
         web_prefs_->default_fixed_font_size = 13;
         web_prefs_->minimum_font_size = 0;
         web_prefs_->minimum_logical_font_size = 9;
         web_prefs_->javascript_can_open_windows_automatically = true;
         web_prefs_->dom_paste_enabled = true;
         web_prefs_->developer_extras_enabled = !layout_test_mode_ ||
             developer_extras_enabled_;
@@ skipping 268 matching lines @@
   return device_orientation_client_mock_.get();
 }
 
 WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() {
   if (!geolocation_client_mock_.get()) {
     geolocation_client_mock_.reset(
         WebKit::WebGeolocationClientMock::create());
   }
   return geolocation_client_mock_.get();
 }