Pass per-script fonts to WebKit settings.

webkit/glue/webpreferences.cc

 // Copyright (c) 2011 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 "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifier.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
@@ skipping 74 matching lines @@
       allow_displaying_insecure_content(true),
       allow_running_insecure_content(false),
       should_print_backgrounds(false),
       enable_scroll_animator(false),
       hixie76_websocket_protocol_enabled(false) {
 }
 
 WebPreferences::~WebPreferences() {
 }
 
+void setStandardFontFamilyWrapper(WebSettings* settings,
+                                  const string16& font,
+                                  UScriptCode script) {
+  settings->setStandardFontFamily(font, script);
+}
+
+void setFixedFontFamilyWrapper(WebSettings* settings,
+                               const string16& font,
+                               UScriptCode script) {
+  settings->setFixedFontFamily(font, script);
+}
+
+void setSerifFontFamilyWrapper(WebSettings* settings,
+                               const string16& font,
+                               UScriptCode script) {
+  settings->setSerifFontFamily(font, script);
+}
+
+void setSansSerifFontFamilyWrapper(WebSettings* settings,
+                                   const string16& font,
+                                   UScriptCode script) {
+  settings->setSansSerifFontFamily(font, script);
+}
+
+void setCursiveFontFamilyWrapper(WebSettings* settings,
+                                 const string16& font,
+                                 UScriptCode script) {
+  settings->setCursiveFontFamily(font, script);
+}
+
+void setFantasyFontFamilyWrapper(WebSettings* settings,
+                                 const string16& font,
+                                 UScriptCode script) {
+  settings->setFantasyFontFamily(font, script);
+}
+
+void WebPreferences::ApplyFontsFromMap(const ScriptFontFamilyMap& map,

[tony, 2011/08/10 19:23:40]

It looks like this could also be a local function rather than a member function.
 It would be nice to keep WebPreferences more like a struct.

+                                       SetFontFamilyWrapper setter,
+                                       WebSettings* settings) const {
+  for (ScriptFontFamilyMap::const_iterator it = map.begin();
+       it != map.end(); ++it) {
+    int32 script = u_getPropertyValueEnum(UCHAR_SCRIPT, (it->first).c_str());
+    if (script >= 0 && script < USCRIPT_CODE_LIMIT)
+      (*setter)(settings, it->second, (UScriptCode) script);
+  }
+}
+
 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);
   settings->setDefaultFontSize(default_font_size);
   settings->setDefaultFixedFontSize(default_fixed_font_size);
   settings->setMinimumFontSize(minimum_font_size);
   settings->setMinimumLogicalFontSize(minimum_logical_font_size);
   settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding));
   settings->setJavaScriptEnabled(javascript_enabled);
   settings->setWebSecurityEnabled(web_security_enabled);
   settings->setJavaScriptCanOpenWindowsAutomatically(
       javascript_can_open_windows_automatically);
   settings->setLoadsImagesAutomatically(loads_images_automatically);
@@ skipping 122 matching lines @@
   settings->setFullScreenEnabled(fullscreen_enabled);
   settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content);
   settings->setAllowRunningOfInsecureContent(allow_running_insecure_content);
   settings->setShouldPrintBackgrounds(should_print_backgrounds);
   settings->setEnableScrollAnimator(enable_scroll_animator);
   settings->setHixie76WebSocketProtocolEnabled(
       hixie76_websocket_protocol_enabled);
 
   WebNetworkStateNotifier::setOnLine(is_online);
 }