diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2018-03-31 11:45:16 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2018-03-31 11:45:16 +0000 |
| commit | c9a6ed3a2821e0063581969993496ba1fca74dbd (patch) | |
| tree | 3e63dcc5f87275d27eeef9eafb2bc47a8a1acd6a /www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc | |
| parent | 1bfffe90f12c7c8dce6e28734a247d447792390c (diff) | |
| download | ports-c9a6ed3a2821e0063581969993496ba1fca74dbd.tar.gz ports-c9a6ed3a2821e0063581969993496ba1fca74dbd.zip | |
www/chromium: update to 65.0.3325.181
Changelog: https://chromium.googlesource.com/chromium/src/+log/64.0.3282.186..65.0.3325.181?pretty=fuller&n=10000
MFH: 2018Q1
Security: https://vuxml.freebsd.org/freebsd/555af074-22b9-11e8-9799-54ee754af08e.html
Security: https://vuxml.freebsd.org/freebsd/3ae21918-31e3-11e8-927b-e8e0b747a45a.html
Notes
Notes:
svn path=/head/; revision=466043
Diffstat (limited to 'www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc')
| -rw-r--r-- | www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc index 473a7b712c24..49bb8b74d309 100644 --- a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,6 +1,16 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2017-07-25 21:04:55.000000000 +0200 -+++ content/browser/child_process_launcher_helper_linux.cc 2017-08-02 00:41:59.942814000 +0200 -@@ -66,6 +66,7 @@ +--- content/browser/child_process_launcher_helper_linux.cc.orig 2018-03-20 23:05:23.000000000 +0100 ++++ content/browser/child_process_launcher_helper_linux.cc 2018-03-24 23:20:38.539917000 +0100 +@@ -17,7 +17,9 @@ + #include "content/public/common/content_switches.h" + #include "content/public/common/result_codes.h" + #include "content/public/common/sandboxed_process_launcher_delegate.h" ++#if !defined(OS_BSD) + #include "content/public/common/zygote_handle.h" ++#endif + #include "gpu/config/gpu_switches.h" + #include "services/service_manager/sandbox/linux/sandbox_linux.h" + +@@ -70,6 +72,7 @@ int* launch_result) { *is_synchronous_launch = true; @@ -8,7 +18,7 @@ ZygoteHandle zygote_handle = base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) ? nullptr -@@ -82,6 +83,7 @@ +@@ -101,6 +104,7 @@ process.zygote = zygote_handle; return process; } @@ -16,7 +26,7 @@ Process process; process.process = base::LaunchProcess(*command_line(), options); -@@ -100,10 +102,12 @@ +@@ -118,10 +122,12 @@ const ChildProcessLauncherHelper::Process& process, bool known_dead, int* exit_code) { @@ -29,7 +39,7 @@ if (known_dead) { return base::GetKnownDeadTerminationStatus( process.process.Handle(), exit_code); -@@ -122,13 +126,17 @@ +@@ -140,13 +146,17 @@ ChildProcessLauncherHelper::Process process) { process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. |