diff options
Diffstat (limited to 'www/chromium/files/patch-content_utility_services.cc')
| -rw-r--r-- | www/chromium/files/patch-content_utility_services.cc | 70 |
1 files changed, 25 insertions, 45 deletions
diff --git a/www/chromium/files/patch-content_utility_services.cc b/www/chromium/files/patch-content_utility_services.cc index 8df3e47d4b6f..5d903f50bbfb 100644 --- a/www/chromium/files/patch-content_utility_services.cc +++ b/www/chromium/files/patch-content_utility_services.cc @@ -1,24 +1,22 @@ ---- content/utility/services.cc.orig 2025-05-05 10:57:53 UTC +--- content/utility/services.cc.orig 2025-09-06 10:01:20 UTC +++ content/utility/services.cc -@@ -73,7 +73,7 @@ +@@ -74,13 +74,13 @@ extern sandbox::TargetServices* g_utility_target_services; #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "media/mojo/services/mojo_video_encode_accelerator_provider_factory.h" #include "sandbox/linux/services/libc_interceptor.h" #include "sandbox/policy/mojom/sandbox.mojom.h" -@@ -101,7 +101,7 @@ extern sandbox::TargetServices* g_utility_target_servi - #endif // BUILDFLAG(IS_CHROMEOS) && (BUILDFLAG(USE_VAAPI) || - // BUILDFLAG(USE_V4L2_CODEC)) + #include "sandbox/policy/sandbox_type.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \ - (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - #include "content/common/features.h" - #include "media/mojo/services/oop_video_decoder_factory_process_service.h" // nogncheck -@@ -237,7 +237,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) ++#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + #include "services/shape_detection/public/mojom/shape_detection_service.mojom.h" // nogncheck + #include "services/shape_detection/shape_detection_service.h" // nogncheck + #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) && BUILDFLAG(IS_CHROMEOS) +@@ -235,7 +235,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -27,39 +25,21 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { -@@ -381,7 +381,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( - #endif // BUILDFLAG(IS_CHROMEOS) && \ - // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \ - (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - auto RunOOPVideoDecoderFactoryProcessService( - mojo::PendingReceiver<media::mojom::VideoDecoderFactoryProcess> receiver) { -@@ -391,7 +391,7 @@ auto RunOOPVideoDecoderFactoryProcessService( - #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && - // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - auto RunVideoEncodeAcceleratorProviderFactory( - mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> +@@ -257,7 +257,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi + return audio::CreateStandaloneService(std::move(receiver)); + } + +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) ++#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + auto RunShapeDetectionService( + mojo::PendingReceiver<shape_detection::mojom::ShapeDetectionService> receiver) { -@@ -414,7 +414,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se - // loop of type IO that can get notified when pipes have data. - services.Add(RunNetworkService); +@@ -432,7 +432,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& + services.Add(RunOnDeviceModel); + } --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \ - (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - services.Add(RunOOPVideoDecoderFactoryProcessService); - #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && -@@ -467,7 +467,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& - #endif // BUILDFLAG(IS_CHROMEOS) && \ - // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - services.Add(RunVideoEncodeAcceleratorProviderFactory); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) ++#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + services.Add(RunShapeDetectionService); + #endif |