mirror of
https://git.freebsd.org/ports.git
synced 2025-06-08 06:10:30 -04:00
4931d3869a
Changelog: https://chromium.googlesource.com/chromium/src/+log/75.0.3770.142..76.0.3809.100?pretty=fuller&n=10000 Submitted by: Matthias Wolf <matthias@rheinwolf.de> MFH: 2019Q3
46 lines
2 KiB
C++
46 lines
2 KiB
C++
--- content/browser/browser_main_loop.cc.orig 2019-07-24 18:58:23 UTC
|
|
+++ content/browser/browser_main_loop.cc
|
|
@@ -251,6 +251,13 @@
|
|
#include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
|
|
#endif
|
|
|
|
+#if defined(OS_BSD)
|
|
+#include "content/browser/sandbox_host_linux.h"
|
|
+#include "services/service_manager/zygote/common/common_sandbox_support_linux.h"
|
|
+#include "content/public/common/common_sandbox_support_linux.h"
|
|
+#include "services/service_manager/sandbox/sandbox.h"
|
|
+#endif
|
|
+
|
|
// One of the linux specific headers defines this as a macro.
|
|
#ifdef DestroyAll
|
|
#undef DestroyAll
|
|
@@ -576,6 +583,11 @@ int BrowserMainLoop::EarlyInitialization() {
|
|
// by now since a thread to start the ServiceManager has been created
|
|
// before the browser main loop starts.
|
|
DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
|
|
+#elif defined(OS_BSD)
|
|
+ SandboxHostLinux::GetInstance()->Init();
|
|
+ base::FileHandleMappingVector fds_to_map;
|
|
+ const int sfd = SandboxHostLinux::GetInstance()->GetChildSocket();
|
|
+ fds_to_map.push_back(std::make_pair(sfd, service_manager::GetSandboxFD()));
|
|
#endif
|
|
|
|
#if defined(USE_X11)
|
|
@@ -619,7 +631,7 @@ int BrowserMainLoop::EarlyInitialization() {
|
|
}
|
|
#endif // defined(OS_ANDROID) || defined(OS_CHROMEOS)
|
|
|
|
-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
|
|
+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \
|
|
defined(OS_ANDROID)
|
|
// We use quite a few file descriptors for our IPC as well as disk the disk
|
|
// cache,and the default limit on the Mac is low (256), so bump it up.
|
|
@@ -629,7 +641,7 @@ int BrowserMainLoop::EarlyInitialization() {
|
|
// users can easily hit this limit with many open tabs. Bump up the limit to
|
|
// an arbitrarily high number. See https://crbug.com/539567
|
|
base::IncreaseFdLimitTo(8192);
|
|
-#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) ||
|
|
+#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) ||
|
|
// defined(OS_ANDROID)
|
|
|
|
#if defined(OS_WIN)
|