45d3cc73dc
A lot of patch files are renamed in this update. Submitted by: Timothy Vaccarelli Obtained from: https://github.com/LeFroid/ MFH: 2016Q2 Security: http://vuxml.freebsd.org/freebsd/c039a761-2c29-11e6-8912-3065ec8fd3ec.html Security: http://vuxml.freebsd.org/freebsd/1a6bbb95-24b8-11e6-bd31-3065ec8fd3ec.html Security: http://vuxml.freebsd.org/freebsd/4dfafa16-24ba-11e6-bd31-3065ec8fd3ec.html Security: http://vuxml.freebsd.org/freebsd/7da1da96-24bb-11e6-bd31-3065ec8fd3ec.html Security: http://vuxml.freebsd.org/freebsd/6d8505f0-0614-11e6-b39c-00262d5ed8ee.html
38 lines
1.6 KiB
C++
38 lines
1.6 KiB
C++
--- 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()) {
|