diff options
Diffstat (limited to 'www/chromium/files/patch-gpu_ipc_service_gpu__init.cc')
| -rw-r--r-- | www/chromium/files/patch-gpu_ipc_service_gpu__init.cc | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index 90c698ef50f2..a28e139469c3 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,5 +1,5 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2017-12-15 02:04:19.000000000 +0100 -+++ gpu/ipc/service/gpu_init.cc 2017-12-31 04:40:00.427872000 +0100 +--- gpu/ipc/service/gpu_init.cc.orig 2018-02-24 16:25:15.000000000 +0100 ++++ gpu/ipc/service/gpu_init.cc 2018-03-04 02:41:07.510363000 +0100 @@ -37,7 +37,7 @@ namespace gpu { @@ -9,7 +9,7 @@ void CollectGraphicsInfo(GPUInfo* gpu_info) { DCHECK(gpu_info); #if defined(OS_FUCHSIA) -@@ -80,9 +80,9 @@ +@@ -77,9 +77,9 @@ } #endif // defined(OS_FUCHSIA) } @@ -20,17 +20,26 @@ +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) bool CanAccessNvidiaDeviceFile() { bool res = true; - base::ThreadRestrictions::AssertIOAllowed(); -@@ -116,7 +116,7 @@ - // passing from browser process. - GetGpuInfoFromCommandLine(*command_line, &gpu_info_); - #endif // OS_ANDROID + base::AssertBlockingAllowed(); +@@ -120,7 +120,7 @@ + // crash during feature collection. + gpu::SetKeysForCrashLogging(gpu_info_); + -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -213,7 +213,7 @@ +@@ -183,7 +183,7 @@ + sandbox_helper_->PreSandboxStartup(); + + bool attempted_startsandbox = false; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_BSD) + // On Chrome OS ARM Mali, GPU driver userspace creates threads when + // initializing a GL context, so start the sandbox early. + // TODO(zmo): Need to collect OS version before this. +@@ -222,7 +222,7 @@ // multiple seconds to finish, which in turn cause the GPU process to crash. // By skipping the following code on Mac, we don't really lose anything, // because the basic GPU information is passed down from the host process. @@ -39,7 +48,7 @@ CollectGraphicsInfo(&gpu_info_); if (gpu_info_.context_info_state == gpu::kCollectInfoFatalFailure) return false; -@@ -288,7 +288,7 @@ +@@ -308,7 +308,7 @@ return; } |