aboutsummaryrefslogtreecommitdiff
path: root/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc')
-rw-r--r--www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc b/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc
index df813441ef1f..edd2f8a5da9a 100644
--- a/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc
+++ b/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc
@@ -1,6 +1,6 @@
---- content/app/content_main_runner_impl.cc.orig 2023-07-21 09:49:17 UTC
+--- content/app/content_main_runner_impl.cc.orig 2023-08-18 10:26:52 UTC
+++ content/app/content_main_runner_impl.cc
-@@ -144,13 +144,13 @@
+@@ -143,13 +143,13 @@
#include "content/browser/posix_file_descriptor_info_impl.h"
#include "content/public/common/content_descriptors.h"
@@ -16,8 +16,8 @@
#include "base/files/file_path_watcher_inotify.h"
#include "base/native_library.h"
#include "base/rand_util.h"
-@@ -193,6 +193,10 @@
- #include "chromeos/startup/startup_switches.h"
+@@ -187,6 +187,10 @@
+ #include "media/base/media_switches.h"
#endif
+#if BUILDFLAG(IS_BSD)
@@ -27,7 +27,7 @@
#if BUILDFLAG(IS_ANDROID)
#include "base/system/sys_info.h"
#include "content/browser/android/battery_metrics.h"
-@@ -394,7 +398,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -372,7 +376,7 @@ void InitializeZygoteSandboxForBrowserProcess(
}
#endif // BUILDFLAG(USE_ZYGOTE)
@@ -36,7 +36,7 @@
#if BUILDFLAG(ENABLE_PPAPI)
// Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -432,7 +436,10 @@ void PreloadLibraryCdms() {
+@@ -410,7 +414,10 @@ void PreloadLibraryCdms() {
void PreSandboxInit() {
// Ensure the /dev/urandom is opened.
@@ -47,7 +47,7 @@
// May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/
// files.
-@@ -443,9 +450,16 @@ void PreSandboxInit() {
+@@ -421,9 +428,16 @@ void PreSandboxInit() {
// https://boringssl.9oo91esource.qjz9zk/boringssl/+/HEAD/SANDBOXING.md
CRYPTO_pre_sandbox_init();
@@ -64,7 +64,7 @@
#if BUILDFLAG(ENABLE_PPAPI)
// Ensure access to the Pepper plugins before the sandbox is turned on.
-@@ -830,11 +844,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -808,11 +822,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
#endif // !BUILDFLAG(IS_ANDROID)
@@ -78,7 +78,7 @@
#endif // !BUILDFLAG(IS_WIN)
-@@ -1029,8 +1042,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -1007,8 +1020,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
process_type == switches::kZygoteProcess) {
PreSandboxInit();
}
@@ -99,7 +99,7 @@
delegate_->SandboxInitialized(process_type);
#if BUILDFLAG(USE_ZYGOTE)
-@@ -1098,7 +1123,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1076,7 +1101,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
->ReconfigureAfterFeatureListInit(process_type);
}
@@ -108,7 +108,7 @@
// If dynamic Mojo Core is being used, ensure that it's loaded very early in
// the child/zygote process, before any sandbox is initialized. The library
// is not fully initialized with IPC support until a ChildProcess is later
-@@ -1133,6 +1158,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1111,6 +1136,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
content_main_params_.reset();
RegisterMainThreadFactories();