diff options
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.cc | 20 |
1 files changed, 10 insertions, 10 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 0b4ba508373d..aeafed35549a 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-05-05 12:12:41 UTC +--- content/app/content_main_runner_impl.cc.orig 2023-06-05 19:39:05 UTC +++ content/app/content_main_runner_impl.cc -@@ -139,13 +139,13 @@ +@@ -143,13 +143,13 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -16,7 +16,7 @@ #include "base/files/file_path_watcher_inotify.h" #include "base/native_library.h" #include "base/rand_util.h" -@@ -188,6 +188,10 @@ +@@ -192,6 +192,10 @@ #include "chromeos/startup/startup_switches.h" #endif @@ -27,7 +27,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -389,7 +393,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -393,7 +397,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 -@@ -427,7 +431,10 @@ void PreloadLibraryCdms() { +@@ -431,7 +435,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. -@@ -438,9 +445,16 @@ void PreSandboxInit() { +@@ -442,9 +449,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. -@@ -810,11 +824,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -829,11 +843,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -78,7 +78,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1002,8 +1015,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1021,8 +1034,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -99,7 +99,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1071,7 +1096,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1090,7 +1115,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 -@@ -1106,6 +1131,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1125,6 +1150,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); |