summaryrefslogtreecommitdiff
path: root/devel/electron7/files/patch-content_browser_browser__main__loop.cc
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron7/files/patch-content_browser_browser__main__loop.cc')
-rw-r--r--devel/electron7/files/patch-content_browser_browser__main__loop.cc46
1 files changed, 0 insertions, 46 deletions
diff --git a/devel/electron7/files/patch-content_browser_browser__main__loop.cc b/devel/electron7/files/patch-content_browser_browser__main__loop.cc
deleted file mode 100644
index 248d6d3ea380..000000000000
--- a/devel/electron7/files/patch-content_browser_browser__main__loop.cc
+++ /dev/null
@@ -1,46 +0,0 @@
---- content/browser/browser_main_loop.cc.orig 2019-12-16 13:32:58 UTC
-+++ content/browser/browser_main_loop.cc
-@@ -244,6 +244,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
-@@ -573,6 +580,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)
-@@ -618,7 +630,7 @@ int BrowserMainLoop::EarlyInitialization() {
- }
- #endif // !defined(OS_MACOSX)
-
--#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.
-@@ -628,7 +640,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)