summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-content_gpu_gpu__main.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2020-04-13 10:37:15 +0000
committerRene Ladan <rene@FreeBSD.org>2020-04-13 10:37:15 +0000
commite3b53fa1271f0ecfc6d650148fa6a2ce7fd59689 (patch)
tree4282b6dacc1a8a20ec4bc04900a236b3e3fb61a0 /www/chromium/files/patch-content_gpu_gpu__main.cc
parentUpdate java plugin. (diff)
www/chromium: update to 81.0.4044.92
Currently the camera and geolocation do not work. Submitted by: Matthias Wolf Obtained from: https://github.com/gliaskos/freebsd-chromium/pull/173 Obtained from: https://github.com/gliaskos/freebsd-chromium/pull/174 MFH: 2020Q2 Security: https://www.vuxml.org/freebsd/6e3b700a-7ca3-11ea-b594-3065ec8fd3ec.html
Diffstat (limited to 'www/chromium/files/patch-content_gpu_gpu__main.cc')
-rw-r--r--www/chromium/files/patch-content_gpu_gpu__main.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc
index 0c5c883fa985..ba08acddf473 100644
--- a/www/chromium/files/patch-content_gpu_gpu__main.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__main.cc
@@ -1,7 +1,7 @@
---- content/gpu/gpu_main.cc.orig 2020-03-03 18:53:54 UTC
+--- content/gpu/gpu_main.cc.orig 2020-03-16 18:40:32 UTC
+++ content/gpu/gpu_main.cc
-@@ -82,7 +82,7 @@
- #include "ui/gfx/x/x11_switches.h" // nogncheck
+@@ -84,7 +84,7 @@
+ #include "ui/gfx/x/x11_switches.h" // nogncheck
#endif
-#if defined(OS_LINUX)
@@ -9,7 +9,7 @@
#include "content/gpu/gpu_sandbox_hook_linux.h"
#include "content/public/common/sandbox_init.h"
#include "services/service_manager/sandbox/linux/sandbox_linux.h"
-@@ -106,7 +106,7 @@ namespace content {
+@@ -109,7 +109,7 @@ namespace content {
namespace {
@@ -18,7 +18,7 @@
bool StartSandboxLinux(gpu::GpuWatchdogThread*,
const gpu::GPUInfo*,
const gpu::GpuPreferences&);
-@@ -174,7 +174,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
+@@ -177,7 +177,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
const gpu::GPUInfo* gpu_info,
const gpu::GpuPreferences& gpu_prefs) override {
@@ -27,7 +27,7 @@
return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
#elif defined(OS_WIN)
return StartSandboxWindows(sandbox_info_);
-@@ -298,7 +298,7 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -301,7 +301,7 @@ int GpuMain(const MainFunctionParams& parameters) {
main_thread_task_executor =
std::make_unique<base::SingleThreadTaskExecutor>(
gpu_preferences.message_pump_type);
@@ -36,7 +36,7 @@
#error "Unsupported Linux platform."
#elif defined(OS_MACOSX)
// Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -409,7 +409,7 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -442,7 +442,7 @@ int GpuMain(const MainFunctionParams& parameters) {
namespace {
@@ -45,7 +45,7 @@
bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
const gpu::GPUInfo* gpu_info,
const gpu::GpuPreferences& gpu_prefs) {
-@@ -444,7 +444,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
+@@ -479,7 +479,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
return res;
}