Cache the current WebPreferences on RenderViewHostImpl.

chrome/browser/ui/prefs/prefs_tab_helper.cc

 // Copyright (c) 2012 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/prefs/prefs_tab_helper.h"
 
 #include <string>
 
 #include "base/prefs/overlay_user_pref_store.h"
 #include "base/prefs/pref_service.h"
@@ skipping 39 matching lines @@
 const char* kPrefsToObserve[] = {
   prefs::kDefaultCharset,
   prefs::kWebKitAllowDisplayingInsecureContent,
   prefs::kWebKitAllowRunningInsecureContent,
   prefs::kWebKitDefaultFixedFontSize,
   prefs::kWebKitDefaultFontSize,
 #if defined(OS_ANDROID)
   prefs::kWebKitFontScaleFactor,
   prefs::kWebKitForceEnableZoom,
   prefs::kWebKitPasswordEchoEnabled,
+  prefs::kWebKitPasswordEchoEnabled,

[jam, 2014/07/21 17:40:33]

this is the same as above. did you mean to add something else?

[chrishtr, 2014/07/21 18:16:07]

No, it's a dup. Fixed.

 #endif
   prefs::kWebKitJavascriptEnabled,
   prefs::kWebKitJavaEnabled,
   prefs::kWebKitLoadsImagesAutomatically,
   prefs::kWebKitMinimumFontSize,
   prefs::kWebKitMinimumLogicalFontSize,
   prefs::kWebKitPluginsEnabled,
   prefs::kWebkitTabsToLinks,
-  prefs::kWebKitUsesUniversalDetector
+  prefs::kWebKitUsesUniversalDetector,
+  prefs::kWebKitJavascriptCanOpenWindowsAutomatically,
+  prefs::kWebKitDomPasteEnabled,
+  prefs::kWebKitShrinksStandaloneImagesToFit,
+  prefs::kWebKitInspectorSettings,
+  prefs::kWebkitTabsToLinks,
+  prefs::kWebKitWebSecurityEnabled,
+  prefs::kDisable3DAPIs,
+  prefs::kWebKitUsesUniversalDetector,
+  prefs::kWebKitTextAreasAreResizable,
+  prefs::kEnableHyperlinkAuditing,

[jam, 2014/07/21 17:40:33]

nit: it would be helpful to sort this list

[chrishtr, 2014/07/21 18:16:07]

Done.

+
 };
 
 const int kPrefsToObserveLength = arraysize(kPrefsToObserve);
 
 #if !defined(OS_ANDROID)
 // Registers a preference under the path |pref_name| for each script used for
 // per-script font prefs.
 // For example, for WEBKIT_WEBPREFS_FONTS_SERIF ("fonts.serif"):
 // "fonts.serif.Arab", "fonts.serif.Hang", etc. are registered.
 // |fonts_with_defaults| contains all |pref_names| already registered since they
@@ skipping 245 matching lines @@
 
     PrefChangeRegistrar::NamedChangeCallback webkit_callback = base::Bind(
         &PrefsTabHelper::OnWebPrefChanged, base::Unretained(this));
     for (int i = 0; i < kPrefsToObserveLength; ++i) {
       const char* pref_name = kPrefsToObserve[i];
       DCHECK(std::string(pref_name) == prefs::kDefaultCharset ||
              StartsWithASCII(pref_name, "webkit.webprefs.", true));
       pref_change_registrar_.Add(pref_name, webkit_callback);
     }
 
-#if !defined(OS_ANDROID)
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitStandardFontFamilyMap,
                                   webkit_callback);
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitFixedFontFamilyMap,
                                   webkit_callback);
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitSerifFontFamilyMap,
                                   webkit_callback);
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitSansSerifFontFamilyMap,
                                   webkit_callback);
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitCursiveFontFamilyMap,
                                   webkit_callback);
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitFantasyFontFamilyMap,
                                   webkit_callback);
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitPictographFontFamilyMap,
                                   webkit_callback);
-#endif  // !defined(OS_ANDROID)
   }
 
   renderer_preferences_util::UpdateFromSystemSettings(
       web_contents_->GetMutableRendererPrefs(), GetProfile());
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES)
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(GetProfile())));
 #endif
@@ skipping 202 matching lines @@
 void PrefsTabHelper::UpdateRendererPreferences() {
   renderer_preferences_util::UpdateFromSystemSettings(
       web_contents_->GetMutableRendererPrefs(), GetProfile());
   web_contents_->GetRenderViewHost()->SyncRendererPrefs();
 }
 
 Profile* PrefsTabHelper::GetProfile() {
   return Profile::FromBrowserContext(web_contents_->GetBrowserContext());
 }
 
-void PrefsTabHelper::OnWebPrefChanged(const std::string& pref_name) {
+void PrefsTabHelper::OnFontFamilyPrefChanged(const std::string& pref_name) {
   // When a font family pref's value goes from non-empty to the empty string, we
   // must add it to the usual WebPreferences struct passed to the renderer.
   //
   // The empty string means to fall back to the pref for the Common script
   // ("Zyyy").  For example, if chrome.fonts.serif.Cyrl is the empty string, it
   // means to use chrome.fonts.serif.Zyyy for Cyrillic script. Prefs that are
   // the empty string are normally not passed to WebKit, since there are so many
   // of them that it would cause a performance regression. Not passing the pref
   // is normally okay since WebKit does the desired fallback behavior regardless
   // of whether the empty string is passed or the pref is not passed at all. But
   // if the pref has changed from non-empty to the empty string, we must let
   // WebKit know.
   std::string generic_family;
   std::string script;
   if (pref_names_util::ParseFontNamePrefPath(pref_name,
                                              &generic_family,
                                              &script)) {
     PrefService* prefs = GetProfile()->GetPrefs();
     std::string pref_value = prefs->GetString(pref_name.c_str());
     if (pref_value.empty()) {
       WebPreferences web_prefs =
           web_contents_->GetRenderViewHost()->GetWebkitPreferences();
       OverrideFontFamily(&web_prefs, generic_family, script, std::string());
       web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs);
       return;
     }
   }
+}
 
-  UpdateWebPreferences();
+void PrefsTabHelper::OnWebPrefChanged(const std::string& pref_name) {
+#if !defined(OS_ANDROID)
+  OnFontFamilyPrefChanged(pref_name);
+#endif
+
+  web_contents_->GetRenderViewHost()->OnWebkitPreferencesChanged();
 }