Pass per-script fonts to WebKit settings.

chrome/browser/tab_contents/render_view_host_delegate_helper.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 "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/string_util.h"
@@ skipping 20 matching lines @@
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/browser/webui/web_ui.h"
 #include "content/common/notification_service.h"
 #include "content/common/view_messages.h"
 #include "net/base/network_change_notifier.h"
 
+namespace {
+
+// Fills |map| with the per-script font prefs under path |map_name|.
+void FillFontFamilyMap(const PrefService* prefs,
+                       const char* map_name,
+                       WebPreferences::ScriptFontFamilyMap* map) {
+  for (size_t i = 0; i < prefs::kWebKitScriptsForFontFamilyMapsLength; ++i) {
+    const char* script = prefs::kWebKitScriptsForFontFamilyMaps[i];
+    std::string pref_name = base::StringPrintf("%s.%s", map_name, script);
+    std::string font_family = prefs->GetString(pref_name.c_str());
+    if (!font_family.empty())
+      map->push_back(std::make_pair(script, UTF8ToUTF16(font_family)));
+  }
+}
+
+} // namespace

[brettw, 2011/08/23 17:19:58]

Two spaces before //

+
+
 RenderViewHostDelegateViewHelper::RenderViewHostDelegateViewHelper() {
   registrar_.Add(this, content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
                  NotificationService::AllSources());
 }
 
 RenderViewHostDelegateViewHelper::~RenderViewHostDelegateViewHelper() {}
 
 void RenderViewHostDelegateViewHelper::Observe(
     int type,
     const NotificationSource& source,
@@ skipping 261 matching lines @@
       UTF8ToUTF16(prefs->GetString(prefs::kWebKitFixedFontFamily));
   web_prefs.serif_font_family =
       UTF8ToUTF16(prefs->GetString(prefs::kWebKitSerifFontFamily));
   web_prefs.sans_serif_font_family =
       UTF8ToUTF16(prefs->GetString(prefs::kWebKitSansSerifFontFamily));
   web_prefs.cursive_font_family =
       UTF8ToUTF16(prefs->GetString(prefs::kWebKitCursiveFontFamily));
   web_prefs.fantasy_font_family =
       UTF8ToUTF16(prefs->GetString(prefs::kWebKitFantasyFontFamily));
 
+  FillFontFamilyMap(prefs, prefs::kWebKitStandardFontFamilyMap,
+                    &web_prefs.standard_font_family_map);
+  FillFontFamilyMap(prefs, prefs::kWebKitFixedFontFamilyMap,
+                    &web_prefs.fixed_font_family_map);
+  FillFontFamilyMap(prefs, prefs::kWebKitSerifFontFamilyMap,
+                    &web_prefs.serif_font_family_map);
+  FillFontFamilyMap(prefs, prefs::kWebKitSansSerifFontFamilyMap,
+                    &web_prefs.sans_serif_font_family_map);
+  FillFontFamilyMap(prefs, prefs::kWebKitCursiveFontFamilyMap,
+                    &web_prefs.cursive_font_family_map);
+  FillFontFamilyMap(prefs, prefs::kWebKitFantasyFontFamilyMap,
+                    &web_prefs.fantasy_font_family_map);
+
   web_prefs.default_font_size =
       prefs->GetInteger(prefs::kWebKitDefaultFontSize);
   web_prefs.default_fixed_font_size =
       prefs->GetInteger(prefs::kWebKitDefaultFixedFontSize);
   web_prefs.minimum_font_size =
       prefs->GetInteger(prefs::kWebKitMinimumFontSize);
   web_prefs.minimum_logical_font_size =
       prefs->GetInteger(prefs::kWebKitMinimumLogicalFontSize);
 
   web_prefs.default_encoding = prefs->GetString(prefs::kDefaultCharset);
@@ skipping 159 matching lines @@
   DictionaryValue* inspector_settings = update.Get();
   inspector_settings->SetWithoutPathExpansion(key,
                                               Value::CreateStringValue(value));
 }
 
 void RenderViewHostDelegateHelper::ClearInspectorSettings(
     content::BrowserContext* browser_context) {
   Profile::FromBrowserContext(browser_context)->GetPrefs()->
       ClearPref(prefs::kWebKitInspectorSettings);
 }