| Index: chrome/browser/chrome_browser_main_linux.cc
|
| diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc
|
| index b7967f86914bf14b20cc1d70e23606f69cb51925..942daad064c9819aee8307d47be5b94328e18cbf 100644
|
| --- a/chrome/browser/chrome_browser_main_linux.cc
|
| +++ b/chrome/browser/chrome_browser_main_linux.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "chrome/browser/chrome_browser_main_linux.h"
|
|
|
| +#include <fontconfig/fontconfig.h>
|
| +
|
| #include "chrome/browser/browser_process.h"
|
| #include "components/breakpad/app/breakpad_linux.h"
|
| #include "components/metrics/metrics_service.h"
|
| @@ -22,6 +24,15 @@ ChromeBrowserMainPartsLinux::ChromeBrowserMainPartsLinux(
|
| ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLinux() {
|
| }
|
|
|
| +void ChromeBrowserMainPartsLinux::ToolkitInitialized() {
|
| + // Explicitly initialize Fontconfig early on to prevent races later due to
|
| + // implicit initialization in response to threads' first calls to Fontconfig:
|
| + // http://crbug.com/404311
|
| + FcInit();
|
| +
|
| + ChromeBrowserMainPartsPosix::ToolkitInitialized();
|
| +}
|
| +
|
| void ChromeBrowserMainPartsLinux::PreProfileInit() {
|
| #if !defined(OS_CHROMEOS)
|
| // Needs to be called after we have chrome::DIR_USER_DATA and
|
|
|