summaryrefslogtreecommitdiff
path: root/devel/electron7/files/patch-content_gpu_gpu__main.cc
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron7/files/patch-content_gpu_gpu__main.cc')
-rw-r--r--devel/electron7/files/patch-content_gpu_gpu__main.cc56
1 files changed, 0 insertions, 56 deletions
diff --git a/devel/electron7/files/patch-content_gpu_gpu__main.cc b/devel/electron7/files/patch-content_gpu_gpu__main.cc
deleted file mode 100644
index 380d185ba885..000000000000
--- a/devel/electron7/files/patch-content_gpu_gpu__main.cc
+++ /dev/null
@@ -1,56 +0,0 @@
---- content/gpu/gpu_main.cc.orig 2019-12-16 13:32:59 UTC
-+++ content/gpu/gpu_main.cc
-@@ -82,7 +82,7 @@
- #include "ui/gfx/x/x11_switches.h" // nogncheck
- #endif
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "content/gpu/gpu_sandbox_hook_linux.h"
- #include "content/public/common/sandbox_init.h"
- #include "services/service_manager/sandbox/linux/sandbox_linux.h"
-@@ -111,7 +111,7 @@ namespace content {
-
- namespace {
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) && !defined(OS_BSD)
- bool StartSandboxLinux(gpu::GpuWatchdogThread*,
- const gpu::GPUInfo*,
- const gpu::GpuPreferences&);
-@@ -172,7 +172,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
- bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
- const gpu::GPUInfo* gpu_info,
- const gpu::GpuPreferences& gpu_prefs) override {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) && !defined(OS_BSD)
- return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
- #elif defined(OS_WIN)
- return StartSandboxWindows(sandbox_info_);
-@@ -280,7 +280,7 @@ int GpuMain(const MainFunctionParams& parameters) {
- main_thread_task_executor =
- std::make_unique<base::SingleThreadTaskExecutor>(
- gpu_preferences.message_pump_type);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #error "Unsupported Linux platform."
- #elif defined(OS_MACOSX)
- // Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -388,7 +388,7 @@ int GpuMain(const MainFunctionParams& parameters) {
-
- namespace {
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) && !defined(OS_BSD)
- bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
- const gpu::GPUInfo* gpu_info,
- const gpu::GpuPreferences& gpu_prefs) {
-@@ -423,7 +423,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
-
- return res;
- }
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) && !defined(OS_BSD)
-
- #if defined(OS_WIN)
- bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo* sandbox_info) {