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 | 23 |
1 files changed, 7 insertions, 16 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 0b3973c1819f..a3ded293c128 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,24 +1,15 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2018-03-20 23:05:26.000000000 +0100 -+++ gpu/ipc/service/gpu_init.cc 2018-03-26 13:24:11.299258000 +0200 -@@ -41,7 +41,7 @@ - #if !defined(OS_MACOSX) - void CollectGraphicsInfo(GPUInfo* gpu_info) { - DCHECK(gpu_info); --#if defined(OS_FUCHSIA) -+#if defined(OS_FUCHSIA) || defined(OS_BSD) - // TODO(crbug.com/707031): Implement this. - NOTIMPLEMENTED(); - return; -@@ -84,7 +84,7 @@ +--- gpu/ipc/service/gpu_init.cc.orig 2018-06-13 00:10:19.000000000 +0200 ++++ gpu/ipc/service/gpu_init.cc 2018-07-19 14:45:14.322631000 +0200 +@@ -70,7 +70,7 @@ } #endif // defined(OS_MACOSX) --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST) && !defined(OS_BSD) bool CanAccessNvidiaDeviceFile() { bool res = true; base::AssertBlockingAllowed(); -@@ -120,7 +120,7 @@ +@@ -106,7 +106,7 @@ // crash during feature collection. gpu::SetKeysForCrashLogging(gpu_info_); @@ -27,7 +18,7 @@ if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -179,7 +179,7 @@ +@@ -172,7 +172,7 @@ sandbox_helper_->PreSandboxStartup(); bool attempted_startsandbox = false; |