Migrate WebKit "global script" font prefs.

webkit/glue/webpreferences.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.
 
 #include "webkit/glue/webpreferences.h"
 
 #include <unicode/uchar.h>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifier.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebNetworkStateNotifier;
 using WebKit::WebRuntimeFeatures;
 using WebKit::WebSettings;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebView;
 
+namespace {
+const char kWebKitCommonScript[] = "Zyyy";

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

How was this string literal chosen?  What is the significance of this name?

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

The font maps are from ISO 15924 script code to font. Zyyy is the code for
undetermined script aka Common, and is the default used on WebKit's side to
get/set a font setting when no script is specified.

+}
+
 WebPreferences::WebPreferences()
-    : standard_font_family(ASCIIToUTF16("Times New Roman")),
-      fixed_font_family(ASCIIToUTF16("Courier New")),
-      serif_font_family(ASCIIToUTF16("Times New Roman")),
-      sans_serif_font_family(ASCIIToUTF16("Arial")),
-      cursive_font_family(ASCIIToUTF16("Script")),
-      fantasy_font_family(),  // Not sure what to use on Windows.
-      default_font_size(16),
+    : default_font_size(16),
       default_fixed_font_size(13),
       minimum_font_size(0),
       minimum_logical_font_size(6),
       default_device_scale_factor(1),
       default_encoding("ISO-8859-1"),
       javascript_enabled(true),
       web_security_enabled(true),
       javascript_can_open_windows_automatically(true),
       loads_images_automatically(true),
       images_enabled(true),
@@ skipping 52 matching lines @@
       allow_displaying_insecure_content(true),
       allow_running_insecure_content(false),
       password_echo_enabled(false),
       should_print_backgrounds(false),
       enable_scroll_animator(false),
       hixie76_websocket_protocol_enabled(false),
       visual_word_movement_enabled(false),
       per_tile_painting_enabled(false),
       css_regions_enabled(false),
       css_shaders_enabled(false) {
+  standard_font_family_map[kWebKitCommonScript] =
+      ASCIIToUTF16("Times New Roman");
+  fixed_font_family_map[kWebKitCommonScript] =
+      ASCIIToUTF16("Courier New");
+  serif_font_family_map[kWebKitCommonScript] =
+      ASCIIToUTF16("Times New Roman");
+  sans_serif_font_family_map[kWebKitCommonScript] =
+      ASCIIToUTF16("Arial");
+  cursive_font_family_map[kWebKitCommonScript] =
+      ASCIIToUTF16("Script");
+  fantasy_font_family_map[kWebKitCommonScript] =
+      ASCIIToUTF16("");  // Not sure what to use on Windows

[tony, 2012/04/27 17:22:18]

Impact is the default on Windows.

[falken, 2012/05/09 06:48:08]

Done.

 }
 
 WebPreferences::~WebPreferences() {
 }
 
 namespace {
 
 void setStandardFontFamilyWrapper(WebSettings* settings,
                                   const string16& font,
                                   UScriptCode script) {
@@ skipping 41 matching lines @@
     int32 script = u_getPropertyValueEnum(UCHAR_SCRIPT, (it->first).c_str());
     if (script >= 0 && script < USCRIPT_CODE_LIMIT)
       (*setter)(settings, it->second, (UScriptCode) script);
   }
 }
 
 }  // namespace
 
 void WebPreferences::Apply(WebView* web_view) const {
   WebSettings* settings = web_view->settings();
-  settings->setStandardFontFamily(standard_font_family);
-  settings->setFixedFontFamily(fixed_font_family);
-  settings->setSerifFontFamily(serif_font_family);
-  settings->setSansSerifFontFamily(sans_serif_font_family);
-  settings->setCursiveFontFamily(cursive_font_family);
-  settings->setFantasyFontFamily(fantasy_font_family);
   ApplyFontsFromMap(standard_font_family_map, setStandardFontFamilyWrapper,
                     settings);
   ApplyFontsFromMap(fixed_font_family_map, setFixedFontFamilyWrapper, settings);
   ApplyFontsFromMap(serif_font_family_map, setSerifFontFamilyWrapper, settings);
   ApplyFontsFromMap(sans_serif_font_family_map, setSansSerifFontFamilyWrapper,
                     settings);
   ApplyFontsFromMap(cursive_font_family_map, setCursiveFontFamilyWrapper,
                     settings);
   ApplyFontsFromMap(fantasy_font_family_map, setFantasyFontFamilyWrapper,
                     settings);
@@ skipping 160 matching lines @@
   settings->setVisualWordMovementEnabled(visual_word_movement_enabled);
 
   // Enable per-tile painting if requested on the command line.
   settings->setPerTilePaintingEnabled(per_tile_painting_enabled);
 
   settings->setExperimentalCSSRegionsEnabled(css_regions_enabled);
   settings->setExperimentalCSSCustomFilterEnabled(css_shaders_enabled);
 
   WebNetworkStateNotifier::setOnLine(is_online);
 }