blob: d700d02df016e5f4fd92a822dde9b2fd434f55f2 (
plain) (
blame)
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
|
--- content/gpu/gpu_main.cc.orig 2017-06-05 19:03:07 UTC
+++ content/gpu/gpu_main.cc
@@ -96,7 +96,7 @@ namespace content {
namespace {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(OS_BSD)
bool StartSandboxLinux(gpu::GpuWatchdogThread*);
#elif defined(OS_WIN)
bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*);
@@ -150,7 +150,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
bool EnsureSandboxInitialized(
gpu::GpuWatchdogThread* watchdog_thread) override {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(OS_BSD)
return StartSandboxLinux(watchdog_thread);
#elif defined(OS_WIN)
return StartSandboxWindows(sandbox_info_);
@@ -301,7 +301,7 @@ int GpuMain(const MainFunctionParams& parameters) {
namespace {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(OS_BSD)
bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread) {
TRACE_EVENT0("gpu,startup", "Initialize sandbox");
|
