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 | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc index 870834b11c62..c28b1490a69a 100644 --- a/www/chromium/files/patch-content_utility_utility__main.cc +++ b/www/chromium/files/patch-content_utility_utility__main.cc @@ -1,12 +1,11 @@ ---- content/utility/utility_main.cc.orig 2022-05-19 14:06:27 UTC +--- content/utility/utility_main.cc.orig 2022-06-17 14:20:10 UTC +++ content/utility/utility_main.cc -@@ -32,18 +32,20 @@ +@@ -31,17 +31,19 @@ #include "third_party/icu/source/common/unicode/unistr.h" #include "third_party/icu/source/i18n/unicode/timezone.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" #include "content/utility/speech/speech_recognition_sandbox_hook_linux.h" #if BUILDFLAG(ENABLE_PRINTING) #include "printing/sandbox/print_backend_sandbox_hook_linux.h" @@ -23,7 +22,7 @@ #include "gpu/config/gpu_info_collector.h" #include "media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h" -@@ -52,6 +54,10 @@ +@@ -50,6 +52,10 @@ #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -34,7 +33,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) #include "ash/services/ime/ime_sandbox_hook.h" #include "chromeos/assistant/buildflags.h" -@@ -139,7 +145,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -129,7 +135,7 @@ int UtilityMain(MainFunctionParams parameters) { } } @@ -43,16 +42,16 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -165,7 +171,7 @@ int UtilityMain(MainFunctionParams parameters) { - case sandbox::mojom::Sandbox::kScreenAI: +@@ -157,7 +163,7 @@ int UtilityMain(MainFunctionParams parameters) { pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook); break; + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -188,10 +194,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -180,10 +186,11 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -65,7 +64,7 @@ if (sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding) { // The kHardwareVideoDecoding sandbox needs to know the GPU type in order // to select the right policy. -@@ -204,6 +211,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -196,6 +203,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } |