diff options
Diffstat (limited to 'www/iridium/files/patch-content_gpu_gpu__main.cc')
| -rw-r--r-- | www/iridium/files/patch-content_gpu_gpu__main.cc | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/www/iridium/files/patch-content_gpu_gpu__main.cc b/www/iridium/files/patch-content_gpu_gpu__main.cc index aba058e673bb..ba08acddf473 100644 --- a/www/iridium/files/patch-content_gpu_gpu__main.cc +++ b/www/iridium/files/patch-content_gpu_gpu__main.cc @@ -1,7 +1,7 @@ ---- content/gpu/gpu_main.cc.orig 2019-03-11 22:00:58 UTC +--- content/gpu/gpu_main.cc.orig 2020-03-16 18:40:32 UTC +++ content/gpu/gpu_main.cc -@@ -78,7 +78,7 @@ - #include "ui/gfx/x/x11_switches.h" // nogncheck +@@ -84,7 +84,7 @@ + #include "ui/gfx/x/x11_switches.h" // nogncheck #endif -#if defined(OS_LINUX) @@ -9,7 +9,7 @@ #include "content/gpu/gpu_sandbox_hook_linux.h" #include "content/public/common/sandbox_init.h" #include "services/service_manager/sandbox/linux/sandbox_linux.h" -@@ -111,7 +111,7 @@ namespace content { +@@ -109,7 +109,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -172,7 +172,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -177,7 +177,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { @@ -27,7 +27,16 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -365,7 +365,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -301,7 +301,7 @@ int GpuMain(const MainFunctionParams& parameters) { + main_thread_task_executor = + std::make_unique<base::SingleThreadTaskExecutor>( + gpu_preferences.message_pump_type); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #error "Unsupported Linux platform." + #elif defined(OS_MACOSX) + // Cross-process CoreAnimation requires a CFRunLoop to function at all, and +@@ -442,7 +442,7 @@ int GpuMain(const MainFunctionParams& parameters) { namespace { @@ -36,7 +45,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -400,7 +400,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -479,7 +479,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo return res; } |