Code to take into account font path specified in registry which matches system font folder. Also ad…

content/renderer/renderer_font_platform_win.cc

 // Copyright 2014 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 "content/renderer/renderer_font_platform_win.h"
 
 #include <dwrite.h>
 #include <string>
 #include <vector>
 #include <wrl/implements.h>
 #include <wrl/wrappers/corewrappers.h>
 
 #include "base/debug/alias.h"
 #include "base/debug/crash_logging.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
+#include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/win/iat_patch_function.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
 
 namespace {
 
 namespace mswr = Microsoft::WRL;
@@ skipping 229 matching lines @@
 bool FontCollectionLoader::LoadFontListFromRegistry() {
   const wchar_t kFontsRegistry[] =
       L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts";
   CHECK(reg_fonts_.empty());
   base::win::RegKey regkey;
   if (regkey.Open(HKEY_LOCAL_MACHINE, kFontsRegistry, KEY_READ) !=
       ERROR_SUCCESS) {
     return false;
   }
 
+  base::FilePath system_font_path;
+  PathService::Get(base::DIR_WINDOWS_FONTS, &system_font_path);
+
   std::wstring name;
   std::wstring value;
   for (DWORD idx = 0; idx < regkey.GetValueCount(); idx++) {
     if (regkey.GetValueNameAt(idx, &name) == ERROR_SUCCESS &&
         regkey.ReadValue(name.c_str(), &value) == ERROR_SUCCESS) {
       base::FilePath path(value.c_str());
       // We need to check if file name is the only component that exists,
       // we will ignore all other registry entries.
       std::vector<base::FilePath::StringType> components;
       path.GetComponents(&components);
-      if (components.size() == 1) {
-        reg_fonts_.push_back(value.c_str());
+      if (components.size() == 1 ||
+          base::FilePath::CompareEqualIgnoreCase(system_font_path.value(),
+                                                 path.DirName().value())) {
+        reg_fonts_.push_back(path.BaseName().value());
       }
     }
   }
+  UMA_HISTOGRAM_COUNTS("DirectWrite.Fonts.Loaded", reg_fonts_.size());
+  UMA_HISTOGRAM_COUNTS("DirectWrite.Fonts.Ignored",
+                       regkey.GetValueCount() - reg_fonts_.size());
   return true;
 }
 
 // This list is mainly based on prefs/prefs_tab_helper.cc kFontDefaults.
 const wchar_t* kRestrictedFontSet[] = {
   L"times.ttf",     // IDS_STANDARD_FONT_FAMILY
   L"timesbd.ttf",   // IDS_STANDARD_FONT_FAMILY
   L"timesbi.ttf",   // IDS_STANDARD_FONT_FAMILY
   L"timesi.ttf",    // IDS_STANDARD_FONT_FAMILY
   L"cour.ttf",      // IDS_FIXED_FONT_FAMILY
@@ skipping 65 matching lines @@
   base::TimeDelta time_delta = base::TimeTicks::Now() - start_tick;
   int64 delta = time_delta.ToInternalValue();
   base::debug::Alias(&delta);
   UINT32 size = g_font_loader->GetFontMapSize();
   base::debug::Alias(&size);
   base::debug::Alias(&loadingRestricted);
 
   CHECK(SUCCEEDED(hr));
   CHECK(g_font_collection.Get() != NULL);
 
+  UMA_HISTOGRAM_TIMES("DirectWrite.Fonts.LoadTime", time_delta);
+
   base::debug::ClearCrashKey(kFontKeyName);
 
   return g_font_collection.Get();
 }
 
 }  // namespace content