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 281 matching lines @@
         TabContents* tab_contents, int route_id) {
   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;
 }
 
+// Fills |map| with the per-script font prefs under path |map_name|.
+static void FillFontFamilyMap(const PrefService* prefs,

[brettw, 2011/08/22 23:23:28]

Don't put static functions in the middle of the file, they should go at the top,
and I'd use an anonymous namespace instead (encouraged by the style guide).

[falken, 2011/08/23 12:05:53]

Done.

+                              const char* map_name,
+                              WebPreferences::ScriptFontFamilyMap* map) {
+  for (size_t i = 0; i < prefs::kWebKitScriptsForFontFamilyMapsLength; ++i) {
+    const char* script = prefs::kWebKitScriptsForFontFamilyMaps[i];
+    const char* pref_name =
+        base::StringPrintf("%s.%s", map_name, script).c_str();

[brettw, 2011/08/22 23:23:28]

This is wrong, the temporary string returned by stringprintf will be destroyed
when this line is done, and pref_name will point to garbage. pref_name should be
a std::string and you should do the c_str() inside the GetString invocation.

[falken, 2011/08/23 12:05:53]

Oops.  Done.

+    std::string font_family = prefs->GetString(pref_name);
+    if (!font_family.empty())
+      map->push_back(std::make_pair(script, UTF8ToUTF16(font_family)));
+  }
+}
+
 // 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, 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);
 }