| Index: content/renderer/renderer_main.cc
|
| diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
|
| index 99a42094feaa839659a7401c6339afd4f2903780..900958e3438168fc2c619b1f375778e8da60a323 100644
|
| --- a/content/renderer/renderer_main.cc
|
| +++ b/content/renderer/renderer_main.cc
|
| @@ -40,6 +40,12 @@
|
| #include "base/android/library_loader/library_loader_hooks.h"
|
| #endif // OS_ANDROID
|
|
|
| +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
| +#include "content/common/font_config_ipc_linux.h"
|
| +#include "content/common/sandbox_linux/sandbox_linux.h"
|
| +#include "third_party/skia/include/ports/SkFontConfigInterface.h"
|
| +#endif
|
| +
|
| #if defined(OS_MACOSX)
|
| #include <Carbon/Carbon.h>
|
| #include <signal.h>
|
| @@ -110,6 +116,15 @@ int RendererMain(const MainFunctionParams& parameters) {
|
| }
|
| #endif
|
|
|
| +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
| + // This call could already have been made from zygote_main_linux.cc. However
|
| + // we need to do it here if Zygote is disabled.
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote)) {
|
| + SkFontConfigInterface::SetGlobal(new FontConfigIPC(GetSandboxFD()))
|
| + ->unref();
|
| + }
|
| +#endif
|
| +
|
| SkGraphics::Init();
|
| #if defined(OS_ANDROID)
|
| const int kMB = 1024 * 1024;
|
|
|