blob: 9d2d427d393d72702af62283b181644b3d238b7f (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
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));
|
