diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2018-03-07 22:13:12 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2018-03-07 22:13:12 +0000 |
| commit | fcc148b0d09fd83d06e1ca68b99695c57798f8d8 (patch) | |
| tree | 87766b8cefb01b1ecbecccc70358a384197b290d /www/chromium/files/patch-content_gpu_gpu__main.cc | |
| parent | 27e69c136da0a7d205e80cc705e93fa2474141bb (diff) | |
| download | ports-fcc148b0d09fd83d06e1ca68b99695c57798f8d8.tar.gz ports-fcc148b0d09fd83d06e1ca68b99695c57798f8d8.zip | |
www/chromium: update to 64.0.3282.186
Changelog: https://chromium.googlesource.com/chromium/src/+log/63.0.3239.132..64.0.3282.186?pretty=fuller&n=10000
MFH: 2018Q1
Security: https://vuxml.freebsd.org/freebsd/8e986b2b-1baa-11e8-a944-54ee754af08e.html
Security: https://vuxml.freebsd.org/freebsd/abfc932e-1ba8-11e8-a944-54ee754af08e.html
Notes
Notes:
svn path=/head/; revision=463839
Diffstat (limited to 'www/chromium/files/patch-content_gpu_gpu__main.cc')
| -rw-r--r-- | www/chromium/files/patch-content_gpu_gpu__main.cc | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 2a49d96a3641..ad458367a988 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,33 +1,42 @@ ---- content/gpu/gpu_main.cc.orig 2017-12-15 02:04:17.000000000 +0100 -+++ content/gpu/gpu_main.cc 2017-12-24 13:25:17.551277000 +0100 -@@ -98,7 +98,7 @@ +--- 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 + #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 @@ namespace { -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) - bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*); - #elif defined(OS_WIN) - bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*); -@@ -156,7 +156,7 @@ - + bool StartSandboxLinux(gpu::GpuWatchdogThread*, + const gpu::GPUInfo*, + const gpu::GpuPreferences&); +@@ -163,7 +163,7 @@ bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, - const gpu::GPUInfo* gpu_info) override { + const gpu::GPUInfo* gpu_info, + const gpu::GpuPreferences& gpu_prefs) override { -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) - return StartSandboxLinux(watchdog_thread, gpu_info); + return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -323,7 +323,7 @@ +@@ -340,7 +340,7 @@ namespace { -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, - const gpu::GPUInfo* gpu_info) { - TRACE_EVENT0("gpu,startup", "Initialize sandbox"); -@@ -347,7 +347,7 @@ + const gpu::GPUInfo* gpu_info, + const gpu::GpuPreferences& gpu_prefs) { +@@ -378,7 +378,7 @@ return res; } |