blob: 4a82d008a8d442a746c21d6a143358275f328c82 (
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
|
--- content/browser/browser_main_loop.cc.orig 2017-04-19 19:06:33 UTC
+++ content/browser/browser_main_loop.cc
@@ -210,6 +210,11 @@
#include "gpu/vulkan/vulkan_implementation.h"
#endif
+#if defined(OS_BSD)
+#include "content/common/sandbox_linux/sandbox_linux.h"
+#include "content/child/child_process_sandbox_support_impl_linux.h"
+#endif
+
// One of the linux specific headers defines this as a macro.
#ifdef DestroyAll
#undef DestroyAll
@@ -218,7 +223,7 @@
namespace content {
namespace {
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
void SetupSandbox(const base::CommandLine& parsed_command_line) {
TRACE_EVENT0("startup", "SetupSandbox");
if (parsed_command_line.HasSwitch(switches::kNoZygote)) {
@@ -584,10 +589,15 @@ void BrowserMainLoop::Init() {
void BrowserMainLoop::EarlyInitialization() {
TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
// No thread should be created before this call, as SetupSandbox()
// will end-up using fork().
SetupSandbox(parsed_command_line_);
+#elif defined(OS_BSD)
+ RenderSandboxHostLinux::GetInstance()->Init();
+ base::FileHandleMappingVector fds_to_map;
+ const int sfd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
+ fds_to_map.push_back(std::make_pair(sfd, GetSandboxFD()));
#endif
#if defined(USE_X11)
|
