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 284 matching lines @@
   if (tab_contents->delegate())
     tab_contents->delegate()->RenderWidgetShowing();
 
   RenderWidgetHostView* widget_host_view = GetCreatedWidget(route_id);
   widget_host_view->InitAsFullscreen(tab_contents->GetRenderWidgetHostView());
   widget_host_view->GetRenderWidgetHost()->Init();
   return widget_host_view;
 }
 
 // static
+void RenderViewHostDelegateHelper::FillFontFamilyMap(

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

Does this need to be part of RenderViewHostDelegateHelper or can we make it
local to the cc file in an anonymous namespace?

+    const DictionaryValue* from, WebPreferences::ScriptFontFamilyMap& to) {
+  if (from) {
+    for (DictionaryValue::key_iterator iter(from->begin_keys());
+         iter != from->end_keys(); ++iter) {
+      string16 value;
+      if (from->GetString(*iter, &value))
+          to.push_back(std::make_pair(*iter, value));
+    }
+  }
+}
+
+// static
 WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
     content::BrowserContext* browser_context, bool is_web_ui) {
   Profile* profile = Profile::FromBrowserContext(browser_context);
   PrefService* prefs = profile->GetPrefs();
   WebPreferences web_prefs;
 
   web_prefs.standard_font_family =
       UTF8ToUTF16(prefs->GetString(prefs::kWebKitStandardFontFamily));
   web_prefs.fixed_font_family =
       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->GetDictionary(prefs::kWebKitStandardFontFamilyMap),
+                    web_prefs.standard_font_family_map);
+  FillFontFamilyMap(prefs->GetDictionary(prefs::kWebKitFixedFontFamilyMap),
+                    web_prefs.fixed_font_family_map);
+  FillFontFamilyMap(prefs->GetDictionary(prefs::kWebKitSerifFontFamilyMap),
+                    web_prefs.serif_font_family_map);
+  FillFontFamilyMap(prefs->GetDictionary(prefs::kWebKitSansSerifFontFamilyMap),
+                    web_prefs.sans_serif_font_family_map);
+  FillFontFamilyMap(prefs->GetDictionary(prefs::kWebKitCursiveFontFamilyMap),
+                    web_prefs.cursive_font_family_map);
+  FillFontFamilyMap(prefs->GetDictionary(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);
 }