diff options
Diffstat (limited to 'www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc')
-rw-r--r-- | www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc b/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc index 1f139c1f642c..86b1f58e8ed4 100644 --- a/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2025-05-31 17:16:41 UTC +--- content/gpu/gpu_main.cc.orig 2025-09-10 13:22:16 UTC +++ content/gpu/gpu_main.cc -@@ -95,10 +95,14 @@ +@@ -107,10 +107,14 @@ #include "sandbox/win/src/sandbox.h" #endif @@ -16,7 +16,7 @@ #include "sandbox/policy/sandbox_type.h" #endif -@@ -116,7 +120,7 @@ namespace content { +@@ -128,7 +132,7 @@ namespace content { namespace { @@ -25,16 +25,16 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -176,7 +180,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -190,7 +194,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { - GPU_STARTUP_TRACE_EVENT("gpu_main::EnsureSandboxInitialized"); + TRACE_EVENT("gpu,startup", "gpu_main::EnsureSandboxInitialized"); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -289,7 +293,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -306,7 +310,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } @@ -43,7 +43,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -315,7 +319,8 @@ int GpuMain(MainFunctionParams parameters) { +@@ -331,7 +335,8 @@ int GpuMain(MainFunctionParams parameters) { base::PlatformThread::SetName("CrGpuMain"); mojo::InterfaceEndpointClient::SetThreadNameSuffixForMetrics("GpuMain"); @@ -53,7 +53,7 @@ // Thread type delegate of the process should be registered before // thread type change below for the main thread and for thread pool in // ChildProcess constructor. -@@ -448,7 +453,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -479,7 +484,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { @@ -62,7 +62,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -488,7 +493,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -527,7 +532,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo sandbox_options.accelerated_video_encode_enabled = !gpu_prefs.disable_accelerated_video_encode; |