1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
--- content/gpu/gpu_main.cc.orig 2019-04-30 22:22:47 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_);
@@ -363,7 +363,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) {
@@ -398,7 +398,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) {
|
