From e292ba0099ecff2e3e31fcb6cac28ac8e243c43d Mon Sep 17 00:00:00 2001 From: "Carlos J. Puga Medina" Date: Fri, 17 Mar 2017 23:42:52 +0000 Subject: www/chromium: update to 57.0.2987.110 MFH: 2017Q1 Security: https://vuxml.freebsd.org/freebsd/a505d397-0758-11e7-8d8b-e8e0b747a45a.html --- ...tch-content_browser_child__process__launcher.cc | 47 ---------------------- 1 file changed, 47 deletions(-) delete mode 100644 www/chromium/files/patch-content_browser_child__process__launcher.cc (limited to 'www/chromium/files/patch-content_browser_child__process__launcher.cc') diff --git a/www/chromium/files/patch-content_browser_child__process__launcher.cc b/www/chromium/files/patch-content_browser_child__process__launcher.cc deleted file mode 100644 index a47b8f91538e..000000000000 --- a/www/chromium/files/patch-content_browser_child__process__launcher.cc +++ /dev/null @@ -1,47 +0,0 @@ ---- content/browser/child_process_launcher.cc.orig 2017-01-26 00:49:13 UTC -+++ content/browser/child_process_launcher.cc -@@ -249,7 +249,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 = - !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) - ? delegate->GetZygote() -@@ -267,7 +267,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 = -@@ -358,7 +358,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. -@@ -475,7 +475,7 @@ void ChildProcessLauncher::Launch(Sandbo - - 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_); -@@ -549,7 +549,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) - zygote_ = zygote; - #endif - if (process_.IsValid()) { -- cgit v1.2.3