Add a cache for FillFontFamilyMap.

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 21 matching lines @@
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/extensions/browser_permissions_policy_delegate.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/extensions/extension_webkit_preferences.h"
 #include "chrome/browser/extensions/suggest_permission_util.h"
+#include "chrome/browser/font_family_cache.h"
 #include "chrome/browser/geolocation/chrome_access_token_store.h"
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h"
 #include "chrome/browser/media/cast_transport_host_filter.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/midi_permission_context.h"
 #include "chrome/browser/media/midi_permission_context_factory.h"
 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
 #include "chrome/browser/net/chrome_net_log.h"
@@ skipping 443 matching lines @@
 
   std::string common_name;
   if (filter.GetString("ISSUER.CN", &common_name) &&
       (cert.issuer().common_name == common_name)) {
     return true;
   }
   return false;
 }
 
 #if !defined(OS_ANDROID)
-// Fills |map| with the per-script font prefs under path |map_name|.
-void FillFontFamilyMap(const PrefService* prefs,
+void FillFontFamilyMap(Profile* profile,

[Lei Zhang, 2014/08/05 19:26:49]

How about making this a static method in FontFamilyCache?

[erikchen, 2014/08/05 20:49:22]

Done.

                        const char* map_name,
                        content::ScriptFontFamilyMap* map) {
-  // TODO(falken): Get rid of the brute-force scan over possible
-  // (font family / script) combinations - see http://crbug.com/308095.
-  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);
-    std::string font_family = prefs->GetString(pref_name.c_str());
-    if (!font_family.empty())
-      (*map)[script] = base::UTF8ToUTF16(font_family);
+  chrome::FontFamilyCache* cache = static_cast<chrome::FontFamilyCache*>(
+      profile->GetUserData(&chrome::kFontFamilyCacheKey));
+  if (!cache) {
+    PrefService* prefs = profile->GetPrefs();
+    cache = new chrome::FontFamilyCache(prefs);
+    // The profile takes ownership of |cache|.
+    profile->SetUserData(&chrome::kFontFamilyCacheKey, cache);
   }
+
+  cache->FillFontFamilyMap(map_name, map);
 }
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
     const std::string& process_type) {
   base::FilePath dumps_path;
   PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path);
   {
     ANNOTATE_SCOPED_MEMORY_LEAK;
     bool upload = (getenv(env_vars::kHeadless) == NULL);
@@ skipping 1888 matching lines @@
 
 void ChromeContentBrowserClient::OverrideWebkitPrefs(
     RenderViewHost* rvh, const GURL& url, WebPreferences* web_prefs) {
   Profile* profile = Profile::FromBrowserContext(
       rvh->GetProcess()->GetBrowserContext());
   PrefService* prefs = profile->GetPrefs();
 
   // Fill per-script font preferences. These are not registered on Android
   // - http://crbug.com/308033.
 #if !defined(OS_ANDROID)
-  FillFontFamilyMap(prefs, prefs::kWebKitStandardFontFamilyMap,
+  FillFontFamilyMap(profile, prefs::kWebKitStandardFontFamilyMap,
                     &web_prefs->standard_font_family_map);
-  FillFontFamilyMap(prefs, prefs::kWebKitFixedFontFamilyMap,
+  FillFontFamilyMap(profile, prefs::kWebKitFixedFontFamilyMap,
                     &web_prefs->fixed_font_family_map);
-  FillFontFamilyMap(prefs, prefs::kWebKitSerifFontFamilyMap,
+  FillFontFamilyMap(profile, prefs::kWebKitSerifFontFamilyMap,
                     &web_prefs->serif_font_family_map);
-  FillFontFamilyMap(prefs, prefs::kWebKitSansSerifFontFamilyMap,
+  FillFontFamilyMap(profile, prefs::kWebKitSansSerifFontFamilyMap,
                     &web_prefs->sans_serif_font_family_map);
-  FillFontFamilyMap(prefs, prefs::kWebKitCursiveFontFamilyMap,
+  FillFontFamilyMap(profile, prefs::kWebKitCursiveFontFamilyMap,
                     &web_prefs->cursive_font_family_map);
-  FillFontFamilyMap(prefs, prefs::kWebKitFantasyFontFamilyMap,
+  FillFontFamilyMap(profile, prefs::kWebKitFantasyFontFamilyMap,
                     &web_prefs->fantasy_font_family_map);
-  FillFontFamilyMap(prefs, prefs::kWebKitPictographFontFamilyMap,
+  FillFontFamilyMap(profile, prefs::kWebKitPictographFontFamilyMap,
                     &web_prefs->pictograph_font_family_map);
 #endif
 
   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 =
@@ skipping 501 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome