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 | 48 |
1 files changed, 33 insertions, 15 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 e5799371ebb4..2c2fc3dcc921 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 2025-05-31 17:16:41 UTC +--- content/app/content_main_runner_impl.cc.orig 2025-09-10 13:22:16 UTC +++ content/app/content_main_runner_impl.cc -@@ -148,18 +148,20 @@ +@@ -150,18 +150,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 -@@ -188,6 +190,10 @@ +@@ -185,6 +187,10 @@ #include "media/base/media_switches.h" #endif @@ -34,16 +34,16 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -386,7 +392,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -381,7 +387,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #if BUILDFLAG(ENABLE_PPAPI) - // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -424,7 +430,10 @@ void PreloadLibraryCdms() { + #if BUILDFLAG(ENABLE_LIBRARY_CDMS) + // Loads registered library CDMs but does not initialize them. This is needed by +@@ -400,7 +406,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. -@@ -436,9 +445,16 @@ void PreSandboxInit() { +@@ -412,9 +421,16 @@ void PreSandboxInit() { // https://boringssl.9oo91esource.qjz9zk/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -69,18 +69,27 @@ base::GetMaxNumberOfInotifyWatches(); +#endif - #if BUILDFLAG(ENABLE_PPAPI) - // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -752,7 +768,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( + #if BUILDFLAG(ENABLE_LIBRARY_CDMS) + // Ensure access to the library CDMs before the sandbox is turned on. +@@ -634,7 +650,7 @@ NO_STACK_PROTECTOR int RunZygote(ContentMainDelegate* + + // Once Zygote forks and feature list initializes we can start a thread to + // begin tracing immediately. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (process_type == switches::kGpuProcess) { + tracing::InitTracingPostFeatureList(/*enable_consumer=*/false, + /*will_trace_thread_restart=*/true); +@@ -733,7 +749,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( + base::HangWatcher::CreateHangWatcherInstance(); unregister_thread_closure = base::HangWatcher::RegisterThread( base::HangWatcher::ThreadType::kMainThread); - bool start_hang_watcher_now; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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. -@@ -865,11 +881,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -851,11 +867,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -94,7 +103,16 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1050,10 +1065,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1007,7 +1022,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam + // SeatbeltExecServer. + CHECK(sandbox::Seatbelt::IsSandboxed()); + } +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // In sandboxed processes and zygotes, certain resource should be pre-warmed + // as they cannot be initialized under a sandbox. In addition, loading these + // resources in zygotes (including the unsandboxed zygote) allows them to be +@@ -1017,10 +1032,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -117,7 +135,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1150,6 +1177,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() { +@@ -1122,6 +1149,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); |