mirror of
https://git.freebsd.org/ports.git
synced 2025-06-22 21:20:31 -04:00
4931d3869a
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
47 lines
1.7 KiB
C++
47 lines
1.7 KiB
C++
--- content/gpu/gpu_main.cc.orig 2019-07-24 18:58:24 UTC
|
|
+++ content/gpu/gpu_main.cc
|
|
@@ -79,7 +79,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"
|
|
@@ -112,7 +112,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&);
|
|
@@ -173,7 +173,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_);
|
|
@@ -369,7 +369,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) {
|
|
@@ -404,7 +404,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) {
|