diff options
Diffstat (limited to 'www/chromium/files/patch-content_app_content__main__runner__impl.cc')
| -rw-r--r-- | www/chromium/files/patch-content_app_content__main__runner__impl.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc index 8b9409f63fee..59f6ab310293 100644 --- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2025-10-02 04:28:32 UTC +--- content/app/content_main_runner_impl.cc.orig 2025-10-30 15:44:36 UTC +++ content/app/content_main_runner_impl.cc -@@ -150,18 +150,21 @@ +@@ -151,18 +151,21 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -20,11 +20,11 @@ +#if !BUILDFLAG(IS_BSD) #include "sandbox/policy/linux/sandbox_linux.h" +#endif -+#include "third_party/skia/experimental/rust_png/ffi/FFI.rs.h" ++#include "third_party/skia/rust/png/FFI.rs.h" #include "third_party/boringssl/src/include/openssl/crypto.h" #include "third_party/webrtc_overrides/init_webrtc.h" // nogncheck -@@ -185,6 +188,10 @@ +@@ -186,6 +189,10 @@ #include "media/base/media_switches.h" #endif @@ -35,7 +35,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -381,7 +388,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -382,7 +389,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) @@ -44,7 +44,7 @@ #if BUILDFLAG(ENABLE_LIBRARY_CDMS) // Loads registered library CDMs but does not initialize them. This is needed by -@@ -400,7 +407,10 @@ void PreloadLibraryCdms() { +@@ -401,7 +408,10 @@ void PreloadLibraryCdms() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. @@ -55,7 +55,7 @@ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -412,9 +422,16 @@ void PreSandboxInit() { +@@ -413,9 +423,16 @@ void PreSandboxInit() { // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -72,7 +72,7 @@ #if BUILDFLAG(ENABLE_LIBRARY_CDMS) // Ensure access to the library CDMs before the sandbox is turned on. -@@ -634,7 +651,7 @@ NO_STACK_PROTECTOR int RunZygote(ContentMainDelegate* +@@ -635,7 +652,7 @@ NO_STACK_PROTECTOR int RunZygote(ContentMainDelegate* // Once Zygote forks and feature list initializes we can start a thread to // begin tracing immediately. @@ -81,7 +81,7 @@ if (process_type == switches::kGpuProcess) { tracing::InitTracingPostFeatureList(/*enable_consumer=*/false, /*will_trace_thread_restart=*/true); -@@ -733,7 +750,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( +@@ -734,7 +751,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( base::HangWatcher::CreateHangWatcherInstance(); unregister_thread_closure = base::HangWatcher::RegisterThread( base::HangWatcher::ThreadType::kMainThread); @@ -90,7 +90,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. -@@ -851,11 +868,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -852,11 +869,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -104,7 +104,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1007,7 +1023,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1008,7 +1024,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam // SeatbeltExecServer. CHECK(sandbox::Seatbelt::IsSandboxed()); } @@ -113,7 +113,7 @@ // 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 +1033,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1018,10 +1034,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -136,7 +136,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1122,6 +1150,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() { +@@ -1123,6 +1151,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); |