aboutsummaryrefslogtreecommitdiff
path: root/www/iridium/files/patch-content_browser_browser__main__loop.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/iridium/files/patch-content_browser_browser__main__loop.cc')
-rw-r--r--www/iridium/files/patch-content_browser_browser__main__loop.cc40
1 files changed, 40 insertions, 0 deletions
diff --git a/www/iridium/files/patch-content_browser_browser__main__loop.cc b/www/iridium/files/patch-content_browser_browser__main__loop.cc
new file mode 100644
index 000000000000..4a82d008a8d4
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_browser__main__loop.cc
@@ -0,0 +1,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)