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 | 24 |
1 files changed, 12 insertions, 12 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 f892589ed3e0..bf22333c2c4e 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 2022-08-31 12:19:35 UTC +--- content/app/content_main_runner_impl.cc.orig 2022-09-24 10:57:32 UTC +++ content/app/content_main_runner_impl.cc -@@ -128,13 +128,13 @@ +@@ -130,13 +130,13 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -16,7 +16,7 @@ #include "base/native_library.h" #include "base/rand_util.h" #include "content/public/common/zygote/sandbox_support_linux.h" -@@ -173,6 +173,10 @@ +@@ -175,6 +175,10 @@ #include "media/base/media_switches.h" #endif @@ -27,16 +27,16 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -358,7 +362,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -360,7 +364,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #if BUILDFLAG(ENABLE_PLUGINS) + #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -394,7 +398,7 @@ void PreloadLibraryCdms() { +@@ -396,7 +400,7 @@ void PreloadLibraryCdms() { } #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) @@ -45,7 +45,7 @@ void PreSandboxInit() { // Pre-acquire resources needed by BoringSSL. See // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md -@@ -410,6 +414,11 @@ void PreSandboxInit() { +@@ -412,6 +416,11 @@ void PreSandboxInit() { #endif InitializeWebRtcModule(); @@ -57,7 +57,7 @@ // Set the android SkFontMgr for blink. We need to ensure this is done // before the sandbox is initialized to allow the font manager to access // font configuration files on disk. -@@ -592,7 +601,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* +@@ -594,7 +603,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -66,7 +66,7 @@ PreSandboxInit(); #endif -@@ -783,11 +792,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -785,11 +794,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -80,7 +80,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -965,6 +973,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -972,6 +980,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam } #endif @@ -97,7 +97,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE_HANDLE) -@@ -1024,7 +1042,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1031,7 +1049,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { mojo::core::InitFeatures(); } @@ -106,7 +106,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 -@@ -1057,6 +1075,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1064,6 +1082,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); |