aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-content_browser_child__process__launcher.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-content_browser_child__process__launcher.cc')
-rw-r--r--www/chromium/files/patch-content_browser_child__process__launcher.cc38
1 files changed, 38 insertions, 0 deletions
diff --git a/www/chromium/files/patch-content_browser_child__process__launcher.cc b/www/chromium/files/patch-content_browser_child__process__launcher.cc
new file mode 100644
index 000000000000..e3cd58cfbb92
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_child__process__launcher.cc
@@ -0,0 +1,38 @@
+--- content/browser/child_process_launcher.cc.orig 2016-05-11 19:02:20 UTC
++++ content/browser/child_process_launcher.cc
+@@ -229,7 +229,7 @@ void LaunchOnLauncherThread(const Notify
+ // We need to close the client end of the IPC channel to reliably detect
+ // child termination.
+
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+ ZygoteHandle* zygote_handle = delegate->GetZygote();
+ // If |zygote_handle| is null, a zygote should not be used.
+ if (zygote_handle) {
+@@ -333,7 +333,7 @@ void TerminateOnLauncherThread(ZygoteHan
+ process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
+ // On POSIX, we must additionally reap the child.
+ #if defined(OS_POSIX)
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+ if (zygote) {
+ // If the renderer was created via a zygote, we have to proxy the reaping
+ // through the zygote process.
+@@ -435,7 +435,7 @@ void ChildProcessLauncher::Launch(
+
+ void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) {
+ DCHECK(CalledOnValidThread());
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ if (zygote_) {
+ termination_status_ = zygote_->GetTerminationStatus(
+ process_.Handle(), known_dead, &exit_code_);
+@@ -505,7 +505,7 @@ void ChildProcessLauncher::Notify(Zygote
+ starting_ = false;
+ process_ = std::move(process);
+
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ zygote_ = zygote;
+ #endif
+ if (process_.IsValid()) {