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 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/www/iridium/files/patch-content_gpu_gpu__main.cc b/www/iridium/files/patch-content_gpu_gpu__main.cc index ad458367a988..aba058e673bb 100644 --- a/www/iridium/files/patch-content_gpu_gpu__main.cc +++ b/www/iridium/files/patch-content_gpu_gpu__main.cc @@ -1,15 +1,15 @@ ---- content/gpu/gpu_main.cc.orig 2018-02-24 16:25:14.000000000 +0100 -+++ content/gpu/gpu_main.cc 2018-03-04 01:23:12.209864000 +0100 -@@ -76,7 +76,7 @@ - #include "ui/gfx/x/x11_switches.h" // nogncheck +--- content/gpu/gpu_main.cc.orig 2019-03-11 22:00:58 UTC ++++ content/gpu/gpu_main.cc +@@ -78,7 +78,7 @@ + #include "ui/gfx/x/x11_switches.h" // nogncheck #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - #include "content/common/font_config_ipc_linux.h" #include "content/gpu/gpu_sandbox_hook_linux.h" - #include "content/public/common/common_sandbox_support_linux.h" -@@ -102,7 +102,7 @@ + #include "content/public/common/sandbox_init.h" + #include "services/service_manager/sandbox/linux/sandbox_linux.h" +@@ -111,7 +111,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -163,7 +163,7 @@ +@@ -172,7 +172,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,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -340,7 +340,7 @@ +@@ -365,7 +365,7 @@ int GpuMain(const MainFunctionParams& parameters) { namespace { @@ -36,7 +36,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -378,7 +378,7 @@ +@@ -400,7 +400,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo return res; } |