1 files changed, 12 insertions, 48 deletions
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc
index ff722f4a3504..1987886fbd17 100644
--- a/www/chromium/files/patch-content_gpu_gpu__main.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__main.cc
@@ -1,56 +1,20 @@
---- content/gpu/gpu_main.cc.orig	2020-07-07 21:58:15 UTC
+--- content/gpu/gpu_main.cc.orig	2020-11-13 06:36:43 UTC
 +++ content/gpu/gpu_main.cc
-@@ -83,7 +83,7 @@
+@@ -86,7 +86,7 @@
  #include "ui/gfx/x/x11_types.h"                          // nogncheck
  #endif
  
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || 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"
-@@ -108,7 +108,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&);
-@@ -161,7 +161,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_);
-@@ -282,7 +282,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)
+ #include "sandbox/policy/linux/sandbox_linux.h"
+@@ -302,7 +302,7 @@ int GpuMain(const MainFunctionParams& parameters) {
+               gpu_preferences.message_pump_type);
+     }
+ #endif
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
  #error "Unsupported Linux platform."
- #elif defined(OS_MACOSX)
+ #elif defined(OS_MAC)
      // Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -424,7 +424,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) {
-@@ -461,7 +461,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) {