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 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc index 16f94dca3000..7502545e588c 100644 --- a/www/chromium/files/patch-content_utility_utility__main.cc +++ b/www/chromium/files/patch-content_utility_utility__main.cc @@ -1,4 +1,4 @@ ---- content/utility/utility_main.cc.orig 2025-09-06 10:01:20 UTC +--- content/utility/utility_main.cc.orig 2025-10-02 04:28:32 UTC +++ content/utility/utility_main.cc @@ -39,17 +39,21 @@ #include "services/tracing/public/cpp/trace_startup.h" @@ -55,7 +55,7 @@ std::vector<std::string> GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -284,7 +293,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -285,7 +294,7 @@ int UtilityMain(MainFunctionParams parameters) { CHECK(on_device_model::PreSandboxInit()); } @@ -64,7 +64,7 @@ #if BUILDFLAG(USE_LINUX_VIDEO_ACCELERATION) && BUILDFLAG(USE_VAAPI) // Regardless of the sandbox status, the VaapiWrapper needs to be initialized -@@ -299,7 +308,10 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -300,7 +309,10 @@ int UtilityMain(MainFunctionParams parameters) { // thread type change in ChildProcess constructor. It also needs to be // registered before the process has multiple threads, which may race with // application of the sandbox. @@ -75,7 +75,7 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict -@@ -331,7 +343,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -332,7 +344,7 @@ int UtilityMain(MainFunctionParams parameters) { pre_sandbox_hook = base::BindOnce(&speech::SpeechRecognitionPreSandboxHook); break; @@ -84,7 +84,7 @@ case sandbox::mojom::Sandbox::kOnDeviceTranslation: pre_sandbox_hook = base::BindOnce( &on_device_translation::OnDeviceTranslationSandboxHook); -@@ -347,7 +359,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -348,7 +360,7 @@ int UtilityMain(MainFunctionParams parameters) { #else NOTREACHED(); #endif @@ -93,7 +93,7 @@ case sandbox::mojom::Sandbox::kVideoEffects: #if BUILDFLAG(ENABLE_VIDEO_EFFECTS) pre_sandbox_hook = -@@ -355,7 +367,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -356,7 +368,7 @@ int UtilityMain(MainFunctionParams parameters) { #endif break; #endif // BUILDFLAG(IS_LINUX) @@ -102,7 +102,7 @@ case sandbox::mojom::Sandbox::kShapeDetection: pre_sandbox_hook = base::BindOnce(&shape_detection::ShapeDetectionPreSandboxHook); -@@ -390,6 +402,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -391,6 +403,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -110,7 +110,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox_options.use_amd_specific_policies = -@@ -397,6 +410,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -398,6 +411,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } |