diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-01-16 22:48:27 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-01-16 22:48:27 +0000 |
| commit | 6dbfad2eb0314255340f744ef913b09fd33f8ed3 (patch) | |
| tree | 2379146fde95ec494ba77d260c6c5d7747a28d42 /www/chromium/files/patch-content_browser_child__process__launcher.cc | |
| parent | Update to 0.1.9 (diff) | |
www/chromium: update to 55.0.2883.87
Reviewed by: rene
MFH: 2017Q1
Security: https://www.vuxml.org/freebsd/603fe0a1-bb26-11e6-8e5a-3065ec8fd3ec.html
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.cc | 29 |
1 files changed, 19 insertions, 10 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 index e3cd58cfbb92..63e9da6bc853 100644 --- a/www/chromium/files/patch-content_browser_child__process__launcher.cc +++ b/www/chromium/files/patch-content_browser_child__process__launcher.cc @@ -1,15 +1,24 @@ ---- content/browser/child_process_launcher.cc.orig 2016-05-11 19:02:20 UTC +--- content/browser/child_process_launcher.cc.orig 2016-12-12 21:01:52 UTC +++ content/browser/child_process_launcher.cc -@@ -229,7 +229,7 @@ void LaunchOnLauncherThread(const Notify +@@ -258,7 +258,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 + ZygoteHandle* zygote_handle = + !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) + ? delegate->GetZygote() +@@ -276,7 +276,7 @@ void LaunchOnLauncherThread(const Notify + process = base::Process(handle); + } else + // Fall through to the normal posix case below when we're not zygoting. +-#endif // !defined(OS_MACOSX) ++#endif // !defined(OS_MACOSX) && !defined(OS_BSD) + { + // Convert FD mapping to FileHandleMappingVector + base::FileHandleMappingVector fds_to_map = +@@ -367,7 +367,7 @@ void TerminateOnLauncherThread(ZygoteHan process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. #if defined(OS_POSIX) @@ -18,7 +27,7 @@ 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( +@@ -488,7 +488,7 @@ void ChildProcessLauncher::Launch( void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) { DCHECK(CalledOnValidThread()); @@ -27,9 +36,9 @@ 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); +@@ -569,7 +569,7 @@ void ChildProcessLauncher::Notify(Zygote + mojo_child_token_, process_error_callback_); + } -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) |