Pass per-script fonts to WebKit settings.

chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

Index: chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
index 8d749c2f191a07305d767fac0687a971b2cfd336..2203d1cd62be2fad0fb2c24febf7f7a78cfdf21d 100644
--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
@@ -212,6 +212,18 @@ PropertyAccessor<TabContentsWrapper*>* TabContentsWrapper::property_accessor() {
   return g_tab_contents_wrapper_property_accessor.Pointer();
 }
 
+void RegisterFontFamilyMap(PrefService* prefs, std::string map_name) {
+  for (size_t i = 0; i < prefs::kWebKitScriptsForFontFamilyMapsLength; ++i) {
+    const char* script = prefs::kWebKitScriptsForFontFamilyMaps[i];
+    std::string pref_name = map_name + "." + script;
+    const char* pref_name_str = pref_name.c_str();
+    if (!prefs->FindPreference(pref_name_str))
+      prefs->RegisterStringPref(pref_name_str,
+                                "",
+                                PrefService::UNSYNCABLE_PREF);
+  }
+}
+
 void TabContentsWrapper::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
                              true,
@@ -283,6 +295,56 @@ void TabContentsWrapper::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterLocalizedStringPref(prefs::kWebKitFantasyFontFamily,
                                      IDS_FANTASY_FONT_FAMILY,
                                      PrefService::UNSYNCABLE_PREF);
+
+#if defined(OS_CHROMEOS)
+  // Register per-script font prefs that have defaults.
+  prefs->RegisterLocalizedStringPref(prefs::kWebKitStandardFontFamilyJapanese,
+      IDS_STANDARD_FONT_FAMILY_JAPANESE, PrefService::UNSYNCABLE_PREF);

[tony, 2011/08/15 23:08:28]

Nit: We may want to move all the font related prefs into a struct and register
prefs in a loop.  This could be a followup change.

+  prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamilyJapanese,
+      IDS_FIXED_FONT_FAMILY_JAPANESE, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamilyJapanese,
+      IDS_SERIF_FONT_FAMILY_JAPANESE, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(prefs::kWebKitSansSerifFontFamilyJapanese,
+      IDS_SANS_SERIF_FONT_FAMILY_JAPANESE, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(prefs::kWebKitStandardFontFamilyKorean,
+      IDS_STANDARD_FONT_FAMILY_KOREAN, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamilyKorean,
+      IDS_FIXED_FONT_FAMILY_KOREAN, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamilyKorean,
+      IDS_SERIF_FONT_FAMILY_KOREAN, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(prefs::kWebKitSansSerifFontFamilyKorean,
+      IDS_SANS_SERIF_FONT_FAMILY_KOREAN, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitStandardFontFamilySimplifiedHan,
+      IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamilySimplifiedHan,
+      IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamilySimplifiedHan,
+      IDS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitSansSerifFontFamilySimplifiedHan,
+      IDS_SANS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitStandardFontFamilyTraditionalHan,
+      IDS_STANDARD_FONT_FAMILY_TRADITIONAL_HAN, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitFixedFontFamilyTraditionalHan,
+      IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitSerifFontFamilyTraditionalHan,
+      IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitSansSerifFontFamilyTraditionalHan,
+      IDS_SANS_SERIF_FONT_FAMILY_TRADITIONAL_HAN, PrefService::UNSYNCABLE_PREF);
+#endif
+
+  RegisterFontFamilyMap(prefs, prefs::kWebKitStandardFontFamilyMap);
+  RegisterFontFamilyMap(prefs, prefs::kWebKitFixedFontFamilyMap);
+  RegisterFontFamilyMap(prefs, prefs::kWebKitSerifFontFamilyMap);
+  RegisterFontFamilyMap(prefs, prefs::kWebKitSansSerifFontFamilyMap);
+  RegisterFontFamilyMap(prefs, prefs::kWebKitCursiveFontFamilyMap);
+  RegisterFontFamilyMap(prefs, prefs::kWebKitFantasyFontFamilyMap);
+
   prefs->RegisterLocalizedIntegerPref(prefs::kWebKitDefaultFontSize,
                                       IDS_DEFAULT_FONT_SIZE,
                                       PrefService::UNSYNCABLE_PREF);