diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2016-11-22 19:10:21 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2016-11-22 19:10:21 +0000 |
| commit | 9187a6460fc419eec4dc64a4569e306722a83427 (patch) | |
| tree | b3d680efe613bd39a30a50f60bcb0ce36a78eab2 /www/chromium/files/patch-content_gpu_gpu__child__thread.cc | |
| parent | Some aarch64 servers apparently have ACPI. Attempt to build on aarch64 (diff) | |
www/chromium: update to 54.0.2840.100
Submitted by: clutton <clutton@zoho.com>
Reviewed by: cpm, rene
Obtained from: https://github.com/paranormal/
MFH: 2016Q4
Security: https://vuxml.freebsd.org/freebsd/769ba449-79e1-11e6-bf75-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/653a8059-7c49-11e6-9242-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/9c135c7e-9fa4-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/9118961b-9fa5-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/ae9cb9b8-a203-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/a3473f5a-a739-11e6-afaa-e8e0b747a45a.html
Differential Revision: https://reviews.freebsd.org/D8517
Diffstat (limited to 'www/chromium/files/patch-content_gpu_gpu__child__thread.cc')
| -rw-r--r-- | www/chromium/files/patch-content_gpu_gpu__child__thread.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/www/chromium/files/patch-content_gpu_gpu__child__thread.cc b/www/chromium/files/patch-content_gpu_gpu__child__thread.cc index e7d1b0b616ac..7a75e262f186 100644 --- a/www/chromium/files/patch-content_gpu_gpu__child__thread.cc +++ b/www/chromium/files/patch-content_gpu_gpu__child__thread.cc @@ -1,14 +1,14 @@ ---- content/gpu/gpu_child_thread.cc.orig 2016-05-11 19:02:21 UTC -+++ content/gpu/gpu_child_thread.cc -@@ -382,6 +382,7 @@ void GpuChildThread::StopWatchdog() { - } +--- content/gpu/gpu_child_thread.cc.orig 2016-10-06 04:02:19.000000000 +0300 ++++ content/gpu/gpu_child_thread.cc 2016-10-14 15:27:34.081648000 +0300 +@@ -419,6 +419,7 @@ + if (dead_on_arrival_) + return; - void GpuChildThread::OnCollectGraphicsInfo() { -+#if !defined(OS_FREEBSD) ++#if !defined(OS_BSD) #if defined(OS_WIN) // GPU full info collection should only happen on un-sandboxed GPU process // or single process/in-process gpu mode on Windows. -@@ -424,6 +425,7 @@ void GpuChildThread::OnCollectGraphicsIn +@@ -461,6 +462,7 @@ base::MessageLoop::current()->QuitWhenIdle(); } #endif // OS_WIN |