diff options
Diffstat (limited to 'www/chromium/files/patch-content_utility_utility__main.cc')
| -rw-r--r-- | www/chromium/files/patch-content_utility_utility__main.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc index f8b3e99ab9e0..cbb896bebdc2 100644 --- a/www/chromium/files/patch-content_utility_utility__main.cc +++ b/www/chromium/files/patch-content_utility_utility__main.cc @@ -1,6 +1,6 @@ ---- content/utility/utility_main.cc.orig 2025-07-02 06:08:04 UTC +--- content/utility/utility_main.cc.orig 2025-08-07 06:57:29 UTC +++ content/utility/utility_main.cc -@@ -37,15 +37,19 @@ +@@ -38,15 +38,19 @@ #include "services/tracing/public/cpp/trace_startup.h" #include "services/video_effects/public/cpp/buildflags.h" @@ -21,7 +21,7 @@ #include "services/audio/audio_sandbox_hook_linux.h" #include "services/network/network_sandbox_hook_linux.h" #include "services/screen_ai/buildflags/buildflags.h" -@@ -70,7 +74,12 @@ +@@ -77,7 +81,12 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -35,7 +35,7 @@ #include "services/video_effects/video_effects_sandbox_hook_linux.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) -@@ -105,7 +114,7 @@ +@@ -112,7 +121,7 @@ sandbox::TargetServices* g_utility_target_services = nullptr; #endif // BUILDFLAG(IS_WIN) @@ -44,7 +44,7 @@ #include "components/services/on_device_translation/sandbox_hook.h" #endif // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX) -@@ -113,7 +122,7 @@ namespace content { +@@ -120,7 +129,7 @@ namespace content { namespace { @@ -53,9 +53,9 @@ std::vector<std::string> GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -252,7 +261,8 @@ int UtilityMain(MainFunctionParams parameters) { - CHECK(on_device_model::OnDeviceModelService::PreSandboxInit()); +@@ -268,7 +277,8 @@ int UtilityMain(MainFunctionParams parameters) { } + #endif // BUILDFLAG(USE_LINUX_VIDEO_ACCELERATION) && BUILDFLAG(USE_VAAPI) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +// XXX BSD @@ -63,7 +63,7 @@ // Thread type delegate of the process should be registered before first // thread type change in ChildProcess constructor. It also needs to be // registered before the process has multiple threads, which may race with -@@ -260,7 +270,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -276,7 +286,7 @@ int UtilityMain(MainFunctionParams parameters) { SandboxedProcessThreadTypeHandler::Create(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -72,7 +72,7 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -292,7 +302,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -308,7 +318,7 @@ int UtilityMain(MainFunctionParams parameters) { pre_sandbox_hook = base::BindOnce(&speech::SpeechRecognitionPreSandboxHook); break; @@ -81,7 +81,7 @@ case sandbox::mojom::Sandbox::kOnDeviceTranslation: pre_sandbox_hook = base::BindOnce( &on_device_translation::OnDeviceTranslationSandboxHook); -@@ -308,7 +318,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -324,7 +334,7 @@ int UtilityMain(MainFunctionParams parameters) { #else NOTREACHED(); #endif @@ -90,7 +90,7 @@ case sandbox::mojom::Sandbox::kVideoEffects: #if BUILDFLAG(ENABLE_VIDEO_EFFECTS) pre_sandbox_hook = -@@ -343,6 +353,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -359,6 +369,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -98,7 +98,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox_options.use_amd_specific_policies = -@@ -350,6 +361,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -366,6 +377,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } |