diff options
Diffstat (limited to 'www/chromium/files/patch-content_renderer_renderer_main.cc')
-rw-r--r-- | www/chromium/files/patch-content_renderer_renderer_main.cc | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/www/chromium/files/patch-content_renderer_renderer_main.cc b/www/chromium/files/patch-content_renderer_renderer_main.cc new file mode 100644 index 000000000000..9d2d427d393d --- /dev/null +++ b/www/chromium/files/patch-content_renderer_renderer_main.cc @@ -0,0 +1,46 @@ +--- content/renderer/renderer_main.cc.orig 2017-09-05 21:05:19.000000000 +0200 ++++ content/renderer/renderer_main.cc 2017-09-09 00:53:51.849087000 +0200 +@@ -34,12 +34,19 @@ + #include "ppapi/features/features.h" + #include "third_party/WebKit/public/platform/scheduler/renderer/renderer_scheduler.h" + #include "third_party/skia/include/core/SkGraphics.h" ++#include "third_party/skia/include/ports/SkFontConfigInterface.h" + #include "ui/base/ui_base_switches.h" + + #if defined(OS_ANDROID) + #include "base/android/library_loader/library_loader_hooks.h" + #endif // OS_ANDROID + ++#if defined(OS_BSD) ++#include "content/browser/renderer_host/render_sandbox_host_linux.h" ++#include "content/common/font_config_ipc_linux.h" ++#include "content/common/sandbox_linux/sandbox_linux.h" ++#endif ++ + #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" +@@ -190,9 +197,13 @@ + // is OK. + InitializeWebRtcModule(); + #endif ++#if defined(OS_BSD) ++ SkFontConfigInterface::SetGlobal( ++ new FontConfigIPC(GetSandboxFD()))->unref(); ++#endif + + { +-#if defined(OS_WIN) || defined(OS_MACOSX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) + // TODO(markus): Check if it is OK to unconditionally move this + // instruction down. + auto render_process = RenderProcessImpl::Create(); +@@ -202,7 +213,7 @@ + bool run_loop = true; + if (!no_sandbox) + run_loop = platform.EnableSandbox(); +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + auto render_process = RenderProcessImpl::Create(); + RenderThreadImpl::Create(std::move(main_message_loop), + std::move(renderer_scheduler)); |