summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
diff options
context:
space:
mode:
authorCarlos J. Puga Medina <cpm@FreeBSD.org>2017-03-17 23:42:52 +0000
committerCarlos J. Puga Medina <cpm@FreeBSD.org>2017-03-17 23:42:52 +0000
commite292ba0099ecff2e3e31fcb6cac28ac8e243c43d (patch)
tree1b74950e1b5750f688522886a8b73c01e56a18c5 /www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
parentgames/openra: update GeoLite2 to March snapshot (diff)
www/chromium: update to 57.0.2987.110
MFH: 2017Q1 Security: https://vuxml.freebsd.org/freebsd/a505d397-0758-11e7-8d8b-e8e0b747a45a.html
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.cc10
1 files changed, 5 insertions, 5 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 4f3dc87cf4b1..044a355f729f 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_init.cc.orig 2017-01-26 00:49:14 UTC
+--- gpu/ipc/service/gpu_init.cc.orig 2017-03-09 20:04:33 UTC
+++ gpu/ipc/service/gpu_init.cc
-@@ -75,7 +75,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI
+@@ -76,7 +76,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI
}
}
@@ -9,7 +9,7 @@
void CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
TRACE_EVENT0("gpu,startup", "Collect Graphics Info");
-@@ -94,7 +94,7 @@ void CollectGraphicsInfo(gpu::GPUInfo& g
+@@ -95,7 +95,7 @@ void CollectGraphicsInfo(gpu::GPUInfo& g
break;
}
}
@@ -18,7 +18,7 @@
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
bool CanAccessNvidiaDeviceFile() {
-@@ -189,7 +189,7 @@ bool GpuInit::InitializeAndStartSandbox(
+@@ -194,7 +194,7 @@ bool GpuInit::InitializeAndStartSandbox(
// 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.
base::TimeTicks before_collect_context_graphics_info = base::TimeTicks::Now();
@@ -27,7 +27,7 @@
CollectGraphicsInfo(gpu_info_);
if (gpu_info_.context_info_state == gpu::kCollectInfoFatalFailure)
return false;
-@@ -206,7 +206,7 @@ bool GpuInit::InitializeAndStartSandbox(
+@@ -211,7 +211,7 @@ bool GpuInit::InitializeAndStartSandbox(
gpu::ApplyGpuDriverBugWorkarounds(
gpu_info_, const_cast<base::CommandLine*>(&command_line));
}