aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
diff options
context:
space:
mode:
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.cc14
1 files changed, 7 insertions, 7 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 2a89d2d51ac1..0f54c1724e7e 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,6 @@
---- content/browser/child_process_launcher_helper_linux.cc.orig 2022-02-28 16:54:41 UTC
+--- content/browser/child_process_launcher_helper_linux.cc.orig 2022-06-17 14:20:10 UTC
+++ content/browser/child_process_launcher_helper_linux.cc
-@@ -19,7 +19,9 @@
+@@ -20,7 +20,9 @@
#include "content/public/common/result_codes.h"
#include "content/public/common/sandboxed_process_launcher_delegate.h"
#include "content/public/common/zygote/sandbox_support_linux.h"
@@ -10,7 +10,7 @@
#include "sandbox/policy/linux/sandbox_linux.h"
namespace content {
-@@ -68,6 +70,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -74,6 +76,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
int* launch_result) {
*is_synchronous_launch = true;
@@ -18,7 +18,7 @@
ZygoteHandle zygote_handle =
base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote)
? nullptr
-@@ -81,7 +84,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -87,7 +90,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
GetProcessType());
*launch_result = LAUNCH_RESULT_SUCCESS;
@@ -26,7 +26,7 @@
if (handle) {
// It could be a renderer process or an utility process.
int oom_score = content::kMiscOomScore;
-@@ -90,13 +92,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -96,13 +98,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
oom_score = content::kLowestRendererOomScore;
ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(handle, oom_score);
}
@@ -41,7 +41,7 @@
Process process;
process.process = base::LaunchProcess(*command_line(), options);
-@@ -114,10 +116,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
+@@ -120,10 +122,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
const ChildProcessLauncherHelper::Process& process,
bool known_dead) {
ChildProcessTerminationInfo info;
@@ -56,7 +56,7 @@
info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(),
&info.exit_code);
} else {
-@@ -141,13 +147,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
+@@ -147,13 +153,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
DCHECK(CurrentlyOnProcessLauncherTaskRunner());
process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
// On POSIX, we must additionally reap the child.