Observe per-script font preferences so WebKit settings are updated when they change.

chrome/browser/ui/tab_contents/tab_contents_wrapper.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/ui/tab_contents/tab_contents_wrapper.h"
 
 #include "base/utf_string_conversions.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 60 matching lines @@
 const char* kPrefsToObserve[] = {
   prefs::kAlternateErrorPagesEnabled,
   prefs::kDefaultCharset,
   prefs::kDefaultZoomLevel,
   prefs::kEnableReferrers,
 #if defined (ENABLE_SAFE_BROWSING)
   prefs::kSafeBrowsingEnabled,
 #endif
   prefs::kWebKitAllowDisplayingInsecureContent,
   prefs::kWebKitAllowRunningInsecureContent,
+  prefs::kWebKitCursiveFontFamily,
   prefs::kWebKitDefaultFixedFontSize,
   prefs::kWebKitDefaultFontSize,
+  prefs::kWebKitFantasyFontFamily,
   prefs::kWebKitFixedFontFamily,
   prefs::kWebKitJavaEnabled,
   prefs::kWebKitJavascriptEnabled,
   prefs::kWebKitLoadsImagesAutomatically,
   prefs::kWebKitMinimumFontSize,
   prefs::kWebKitMinimumLogicalFontSize,
   prefs::kWebKitPluginsEnabled,
   prefs::kWebKitSansSerifFontFamily,
   prefs::kWebKitSerifFontFamily,
   prefs::kWebKitStandardFontFamily,
   prefs::kWebkitTabsToLinks,
   prefs::kWebKitUsesUniversalDetector
 };
 
 const int kPrefsToObserveLength = arraysize(kPrefsToObserve);
 
 // Registers a preference under the path |map_name| for each script used for
 // per-script font prefs.  For example, if |map_name| is "fonts.serif", then
 // "fonts.serif.Arab", "fonts.serif.Hang", etc. are registered.
 void RegisterFontFamilyMap(PrefService* prefs, const char* map_name) {
   for (size_t i = 0; i < prefs::kWebKitScriptsForFontFamilyMapsLength; ++i) {
     const char* script = prefs::kWebKitScriptsForFontFamilyMaps[i];
     std::string pref_name_str = base::StringPrintf("%s.%s", map_name, script);
     const char* pref_name = pref_name_str.c_str();
     if (!prefs->FindPreference(pref_name))
       prefs->RegisterStringPref(pref_name, "", PrefService::UNSYNCABLE_PREF);
   }
 }
 
+// Registers |obs| to observe per-script font prefs under the path |map_name|.
+void RegisterFontFamilyMapObserver(PrefChangeRegistrar* registrar,
+                                   const char* map_name,
+                                   content::NotificationObserver* obs) {
+  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);
+    registrar->Add(pref_name.c_str(), obs);
+  }
+}
+
 struct PerScriptFontDefault {
   const char* pref_name;
   int resource_id;
   const char* native_locale;
 };
 
 // Per-script font pref defaults.  The prefs that have defaults vary by
 // platform, since not all platforms have fonts for all scripts for all generic
 // families.
 // TODO(falken): add proper defaults when possible for all
@@ skipping 190 matching lines @@
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(profile())));
 #endif
 
   // Register for notifications about all interested prefs change.
   PrefService* prefs = profile()->GetPrefs();
   pref_change_registrar_.Init(prefs);
   if (prefs) {
     for (int i = 0; i < kPrefsToObserveLength; ++i)
       pref_change_registrar_.Add(kPrefsToObserve[i], this);
+
+    RegisterFontFamilyMapObserver(&pref_change_registrar_,
+                                  prefs::kWebKitStandardFontFamilyMap, this);
+    RegisterFontFamilyMapObserver(&pref_change_registrar_,
+                                  prefs::kWebKitFixedFontFamilyMap, this);
+    RegisterFontFamilyMapObserver(&pref_change_registrar_,
+                                  prefs::kWebKitSerifFontFamilyMap, this);
+    RegisterFontFamilyMapObserver(&pref_change_registrar_,
+                                  prefs::kWebKitSansSerifFontFamilyMap, this);
+    RegisterFontFamilyMapObserver(&pref_change_registrar_,
+                                  prefs::kWebKitCursiveFontFamilyMap, this);
+    RegisterFontFamilyMapObserver(&pref_change_registrar_,
+                                  prefs::kWebKitFantasyFontFamilyMap, this);
   }
 
   renderer_preferences_util::UpdateFromSystemSettings(
       tab_contents()->GetMutableRendererPrefs(), profile());
 }
 
 TabContentsWrapper::~TabContentsWrapper() {
   in_destructor_ = true;
 
   // Need to tear down infobars before the TabContents goes away.
@@ skipping 353 matching lines @@
   render_view_host()->Send(
       new ChromeViewMsg_SetClientSidePhishingDetection(routing_id(),
                                                        safe_browsing));
 #endif
 }
 
 void TabContentsWrapper::ExitFullscreenMode() {
   if (tab_contents() && render_view_host())
     tab_contents()->render_view_host()->ExitFullscreen();
 }