aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
diff options
context:
space:
mode:
authorCarlos J. Puga Medina <cpm@FreeBSD.org>2019-08-12 10:39:48 +0000
committerCarlos J. Puga Medina <cpm@FreeBSD.org>2019-08-12 10:39:48 +0000
commit4931d3869a6dd44297e7062d19250b953725dca9 (patch)
treece003d403a39427dd9d741e17935752ff90aa5a6 /www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
parentcb31f1a63f19104a3fae0c9cd4c02b391be40888 (diff)
downloadports-4931d3869a6dd44297e7062d19250b953725dca9.tar.gz
ports-4931d3869a6dd44297e7062d19250b953725dca9.zip
www/chromium: Update to 76.0.3809.100
Changelog: https://chromium.googlesource.com/chromium/src/+log/75.0.3770.142..76.0.3809.100?pretty=fuller&n=10000 Submitted by: Matthias Wolf <matthias@rheinwolf.de> MFH: 2019Q3
Notes
Notes: svn path=/head/; revision=508722
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.cc30
1 files changed, 15 insertions, 15 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 579cba128615..5aab116e20b1 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,15 +1,15 @@
---- gpu/ipc/service/gpu_init.cc.orig 2019-06-04 18:55:24 UTC
+--- gpu/ipc/service/gpu_init.cc.orig 2019-07-24 18:58:27 UTC
+++ gpu/ipc/service/gpu_init.cc
-@@ -88,7 +88,7 @@ void InitializeDirectCompositionOverlaySupport(GPUInfo
+@@ -107,7 +107,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
+ #endif
}
- #endif // defined(OS_WIN)
-#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::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
-@@ -99,7 +99,7 @@ bool CanAccessNvidiaDeviceFile() {
+@@ -118,7 +118,7 @@ bool CanAccessNvidiaDeviceFile() {
}
return res;
}
@@ -18,7 +18,7 @@
} // namespace
-@@ -131,7 +131,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -150,7 +150,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
// crash during feature collection.
gpu::SetKeysForCrashLogging(gpu_info_);
@@ -27,7 +27,7 @@
if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA
gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile())
return false;
-@@ -201,7 +201,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -220,7 +220,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
sandbox_helper_->PreSandboxStartup();
bool attempted_startsandbox = false;
@@ -36,7 +36,7 @@
// 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.
-@@ -210,7 +210,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -229,7 +229,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
watchdog_thread_.get(), &gpu_info_, gpu_preferences_);
attempted_startsandbox = true;
}
@@ -45,16 +45,16 @@
base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
-@@ -307,7 +307,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
- InitializeDirectCompositionOverlaySupport(&gpu_info_);
- #endif
+@@ -328,7 +328,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+
+ InitializePlatformOverlaySettings(&gpu_info_);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// Driver may create a compatibility profile context when collect graphics
// information on Linux platform. Try to collect graphics information
// based on core profile context after disabling platform extensions.
-@@ -329,7 +329,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -350,7 +350,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
}
}
}
@@ -63,16 +63,16 @@
if (use_swiftshader) {
AdjustInfoToSwiftShader();
-@@ -489,7 +489,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
- InitializeDirectCompositionOverlaySupport(&gpu_info_);
- #endif
+@@ -516,7 +516,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+
+ InitializePlatformOverlaySettings(&gpu_info_);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// Driver may create a compatibility profile context when collect graphics
// information on Linux platform. Try to collect graphics information
// based on core profile context after disabling platform extensions.
-@@ -509,7 +509,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -536,7 +536,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
}
}
}