diff options
Diffstat (limited to 'www/iridium/files/patch-content_utility_services.cc')
-rw-r--r-- | www/iridium/files/patch-content_utility_services.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/www/iridium/files/patch-content_utility_services.cc b/www/iridium/files/patch-content_utility_services.cc index 32ee417b0808..ece09d0bc120 100644 --- a/www/iridium/files/patch-content_utility_services.cc +++ b/www/iridium/files/patch-content_utility_services.cc @@ -1,4 +1,4 @@ ---- content/utility/services.cc.orig 2024-06-25 12:08:48 UTC +--- content/utility/services.cc.orig 2024-11-04 08:56:03 UTC +++ content/utility/services.cc @@ -74,7 +74,7 @@ extern sandbox::TargetServices* g_utility_target_services; @@ -9,7 +9,7 @@ #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" -@@ -97,7 +97,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -102,7 +102,7 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -18,7 +18,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) #include "content/common/features.h" #include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck -@@ -115,13 +115,13 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -120,13 +120,13 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ @@ -34,7 +34,7 @@ #include "media/capture/capture_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -239,7 +239,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi +@@ -244,7 +244,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -43,7 +43,7 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { -@@ -328,7 +328,7 @@ auto RunVideoCapture( +@@ -340,7 +340,7 @@ auto RunVideoCapture( #endif // BUILDFLAG(IS_CHROMEOS_ASH) auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>( std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault()); @@ -52,7 +52,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) { #else -@@ -384,7 +384,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +@@ -395,7 +395,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -61,7 +61,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryProcessService( mojo::PendingReceiver< -@@ -395,7 +395,7 @@ auto RunStableVideoDecoderFactoryProcessService( +@@ -406,7 +406,7 @@ auto RunStableVideoDecoderFactoryProcessService( #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) @@ -70,7 +70,7 @@ auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> receiver) { -@@ -418,7 +418,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se +@@ -429,7 +429,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se // loop of type IO that can get notified when pipes have data. services.Add(RunNetworkService); @@ -79,7 +79,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) if (base::FeatureList::IsEnabled( features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -470,7 +470,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -485,7 +485,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -88,7 +88,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) if (!base::FeatureList::IsEnabled( features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -479,7 +479,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -494,7 +494,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) |