diff options
Diffstat (limited to 'www/chromium/files/patch-content_browser_browser__main__loop.cc')
| -rw-r--r-- | www/chromium/files/patch-content_browser_browser__main__loop.cc | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc index fe1340923490..65f818d6fdd9 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,15 +1,15 @@ ---- content/browser/browser_main_loop.cc.orig 2018-03-20 23:05:23.000000000 +0100 -+++ content/browser/browser_main_loop.cc 2018-03-24 14:03:10.531359000 +0100 -@@ -212,7 +212,7 @@ +--- content/browser/browser_main_loop.cc.orig 2018-06-13 00:10:16.000000000 +0200 ++++ content/browser/browser_main_loop.cc 2018-07-19 00:30:26.119970000 +0200 +@@ -205,7 +205,7 @@ #include "base/fuchsia/default_job.h" #endif // defined(OS_FUCHSIA) -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) #include "content/browser/sandbox_host_linux.h" - #include "content/browser/zygote_host/zygote_host_impl_linux.h" + #endif -@@ -254,6 +254,11 @@ +@@ -240,6 +240,11 @@ #include "services/ui/common/image_cursors_set.h" #endif @@ -21,15 +21,10 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -655,10 +660,15 @@ - TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); - - #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ -- !defined(OS_FUCHSIA) -+ !defined(OS_FUCHSIA) && !defined(OS_BSD) - // No thread should be created before this call, as SetupSandbox() - // will end-up using fork(). - SetupSandbox(parsed_command_line_); +@@ -548,6 +553,11 @@ + // 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; |