Switch to direct write font proxy and remove the font cache.

chrome/browser/chrome_browser_main_win.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_browser_main_win.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
 #include <algorithm>
@@ skipping 39 matching lines @@
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/installer_util_strings.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/browser/utility_process_host_client.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/dwrite_font_platform_win.h"
 #include "content/public/common/main_function_params.h"
 #include "ui/base/cursor/cursor_loader_win.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/win/message_box_win.h"
 #include "ui/gfx/platform_font_win.h"
 #include "ui/gfx/switches.h"
 #include "ui/gfx/win/direct_write.h"
 #include "ui/strings/grit/app_locale_settings.h"
 
 #if defined(GOOGLE_CHROME_BUILD)
 #include "chrome/browser/google/did_run_updater_win.h"
 #endif
 
 #if defined(KASKO)
 #include "syzygy/kasko/api/reporter.h"
 #endif
 
 namespace {
 
 typedef HRESULT (STDAPICALLTYPE* RegisterApplicationRestartProc)(
     const wchar_t* command_line,
     DWORD flags);
 
+const char kFontCacheSharedSectionName[] = "ChromeDWriteFontCache";
+
 void InitializeWindowProcExceptions() {
   // Get the breakpad pointer from chrome.exe
   base::win::WinProcExceptionFilter exception_filter =
       reinterpret_cast<base::win::WinProcExceptionFilter>(
           ::GetProcAddress(::GetModuleHandle(
                                chrome::kBrowserProcessExecutableName),
                            "CrashForException"));
   exception_filter = base::win::SetWinProcExceptionFilter(exception_filter);
   DCHECK(!exception_filter);
 }
 
 // gfx::Font callbacks
 void AdjustUIFont(LOGFONT* logfont) {
   l10n_util::AdjustUIFont(logfont);
 }
 
 int GetMinimumFontSize() {
   int min_font_size;
   base::StringToInt(l10n_util::GetStringUTF16(IDS_MINIMUM_UI_FONT_SIZE),
                     &min_font_size);
   return min_font_size;
 }
 
 class TranslationDelegate : public installer::TranslationDelegate {
  public:
   base::string16 GetLocalizedString(int installer_string_id) override;
 };
 
-void ExecuteFontCacheBuildTask(const base::FilePath& path) {
-  base::WeakPtr<content::UtilityProcessHost> utility_process_host(
-      content::UtilityProcessHost::Create(NULL, NULL)->AsWeakPtr());
-  utility_process_host->SetName(l10n_util::GetStringUTF16(
-      IDS_UTILITY_PROCESS_FONT_CACHE_BUILDER_NAME));
-  utility_process_host->DisableSandbox();
-  utility_process_host->Send(
-      new ChromeUtilityHostMsg_BuildDirectWriteFontCache(path));
-}
-
 #if defined(KASKO)
 void ObserveFailedCrashReportDirectory(const base::FilePath& path, bool error) {
   DCHECK(!error);
   if (error)
     return;
   base::FileEnumerator enumerator(path, true, base::FileEnumerator::FILES);
   for (base::FilePath report_file = enumerator.Next(); !report_file.empty();
        report_file = enumerator.Next()) {
     if (report_file.Extension() ==
         kasko::api::kPermanentFailureMinidumpExtension) {
@@ skipping 74 matching lines @@
 
   // Look for the DLLs used to implement the FTH and other compat hacks.
   if (GetModuleHandleW(L"AcLayers.dll") != NULL)
     detected = static_cast<FTHFlags>(detected | FTH_ACLAYERS_LOADED);
   if (GetModuleHandleW(L"AcXtrnal.dll") != NULL)
     detected = static_cast<FTHFlags>(detected | FTH_ACXTRNAL_LOADED);
 
   UMA_HISTOGRAM_ENUMERATION("FaultTolerantHeap", detected, FTH_FLAGS_COUNT);
 }
 
+void DeleteDirectWriteFontCache(base::FilePath path) {
+  // Attempt to delete the font cache and ignore any errors.
+  base::DeleteFile(path, false /*recursive*/);
+}
+
 }  // namespace
 
 void ShowCloseBrowserFirstMessageBox() {
   int message_id = IDS_UNINSTALL_CLOSE_APP;
   if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
       (ShellIntegration::GetDefaultBrowser() == ShellIntegration::IS_DEFAULT)) {
     message_id = IDS_UNINSTALL_CLOSE_APP_IMMERSIVE;
   }
   chrome::ShowMessageBox(NULL,
                          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
@@ skipping 107 matching lines @@
 void ChromeBrowserMainPartsWin::ShowMissingLocaleMessageBox() {
   ui::MessageBox(NULL,
                  base::ASCIIToUTF16(chrome_browser::kMissingLocaleDataMessage),
                  base::ASCIIToUTF16(chrome_browser::kMissingLocaleDataTitle),
                  MB_OK | MB_ICONERROR | MB_TOPMOST);
 }
 
 void ChromeBrowserMainPartsWin::PostProfileInit() {
   ChromeBrowserMainParts::PostProfileInit();
 
-  // DirectWrite support is mainly available Windows 7 and up.
   if (gfx::win::ShouldUseDirectWrite()) {
+    // Clean up the direct write font cache since we no longer use that
+    // codepath.
+    // TODO(kulshin): remove this code after several releases.
     base::FilePath path(
-      profile()->GetPath().AppendASCII(content::kFontCacheSharedSectionName));
-    // This function will create a read only section if cache file exists
-    // otherwise it will spawn utility process to build cache file, which will
-    // be used during next browser start/postprofileinit.
-    if (!content::LoadFontCache(path)) {
-      // We delay building of font cache until first startup page loads.
-      // During first renderer start there are lot of things happening
-      // simultaneously some of them are:
-      // - Renderer is going through all font files on the system to create
-      //   a font collection.
-      // - Renderer loading up startup URL, accessing HTML/JS File cache,
-      //   net activity etc.
-      // - Extension initialization.
-      // We delay building of cache mainly to avoid parallel font file
-      // loading along with Renderer. Some systems have significant number of
-      // font files which takes long time to process.
-      // Related information is at http://crbug.com/436195.
-      const int kBuildFontCacheDelaySec = 30;
-      content::BrowserThread::PostDelayedTask(
-          content::BrowserThread::IO,
-          FROM_HERE,
-          base::Bind(ExecuteFontCacheBuildTask, path),
-          base::TimeDelta::FromSeconds(kBuildFontCacheDelaySec));
-    }
+        profile()->GetPath().AppendASCII(kFontCacheSharedSectionName));
+    const int kBuildFontCacheDelaySec = 30;
+    content::BrowserThread::PostDelayedTask(
+        content::BrowserThread::FILE, FROM_HERE,
+        base::Bind(DeleteDirectWriteFontCache, path),
+        base::TimeDelta::FromSeconds(kBuildFontCacheDelaySec));
   }
 }
 
 void ChromeBrowserMainPartsWin::PostBrowserStart() {
   ChromeBrowserMainParts::PostBrowserStart();
 
   UMA_HISTOGRAM_BOOLEAN("Windows.Tablet", base::win::IsTabletDevice());
 
   // Set up a task to verify installed modules in the current process.
   content::BrowserThread::PostAfterStartupTask(
@@ skipping 191 matching lines @@
   if (resource_id)
     return l10n_util::GetStringUTF16(resource_id);
   return base::string16();
 }
 
 // static
 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
   CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
   installer::SetTranslationDelegate(&delegate);
 }