diff options
Diffstat (limited to 'www/iridium/files/patch-content_app_content__main__runner__impl.cc')
| -rw-r--r-- | www/iridium/files/patch-content_app_content__main__runner__impl.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/www/iridium/files/patch-content_app_content__main__runner__impl.cc b/www/iridium/files/patch-content_app_content__main__runner__impl.cc index dd60fd276fa9..bc90c4a5a51f 100644 --- a/www/iridium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/iridium/files/patch-content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2025-05-07 06:48:23 UTC +--- content/app/content_main_runner_impl.cc.orig 2025-06-19 07:37:57 UTC +++ content/app/content_main_runner_impl.cc -@@ -146,18 +146,20 @@ +@@ -148,18 +148,20 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -23,7 +23,7 @@ #include "third_party/boringssl/src/include/openssl/crypto.h" #include "third_party/webrtc_overrides/init_webrtc.h" // nogncheck -@@ -186,6 +188,10 @@ +@@ -188,6 +190,10 @@ #include "media/base/media_switches.h" #endif @@ -34,7 +34,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -384,7 +390,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -386,7 +392,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) @@ -43,7 +43,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -422,7 +428,10 @@ void PreloadLibraryCdms() { +@@ -424,7 +430,10 @@ void PreloadLibraryCdms() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. @@ -54,7 +54,7 @@ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -434,9 +443,16 @@ void PreSandboxInit() { +@@ -436,9 +445,16 @@ void PreSandboxInit() { // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -71,7 +71,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -750,7 +766,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( +@@ -752,7 +768,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( unregister_thread_closure = base::HangWatcher::RegisterThread( base::HangWatcher::ThreadType::kMainThread); bool start_hang_watcher_now; @@ -80,7 +80,7 @@ // On Linux/ChromeOS, the HangWatcher can't start until after the sandbox is // initialized, because the sandbox can't be started with multiple threads. // TODO(mpdenton): start the HangWatcher after the sandbox is initialized. -@@ -863,11 +879,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -865,11 +881,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -94,13 +94,13 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1048,10 +1063,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1050,10 +1065,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } +#elif BUILDFLAG(IS_BSD) + PreSandboxInit(); - #elif BUILDFLAG(IS_IOS) + #elif BUILDFLAG(IS_IOS) && !BUILDFLAG(IS_IOS_TVOS) ChildProcessEnterSandbox(); #endif @@ -117,7 +117,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1148,6 +1175,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() { +@@ -1150,6 +1177,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); |