| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stdlib.h> | 5 #include <stdlib.h> |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <dwmapi.h> | 8 #include <dwmapi.h> |
| 9 #include <windows.h> | 9 #include <windows.h> |
| 10 #endif | 10 #endif |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 #if defined(USE_X11) | 47 #if defined(USE_X11) |
| 48 #include "ui/base/x/x11_util.h" | 48 #include "ui/base/x/x11_util.h" |
| 49 #endif | 49 #endif |
| 50 | 50 |
| 51 #if defined(OS_LINUX) | 51 #if defined(OS_LINUX) |
| 52 #include "content/public/common/sandbox_init.h" | 52 #include "content/public/common/sandbox_init.h" |
| 53 #endif | 53 #endif |
| 54 | 54 |
| 55 #if defined(OS_MACOSX) | 55 #if defined(OS_MACOSX) |
| 56 #include "base/message_loop/message_pump_mac.h" | 56 #include "base/message_loop/message_pump_mac.h" |
| 57 #include "content/common/sandbox_mac.h" |
| 57 #endif | 58 #endif |
| 58 | 59 |
| 59 #if defined(ADDRESS_SANITIZER) | 60 #if defined(ADDRESS_SANITIZER) |
| 60 #include <sanitizer/asan_interface.h> | 61 #include <sanitizer/asan_interface.h> |
| 61 #endif | 62 #endif |
| 62 | 63 |
| 63 const int kGpuTimeout = 10000; | 64 const int kGpuTimeout = 10000; |
| 64 | 65 |
| 65 namespace content { | 66 namespace content { |
| 66 | 67 |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 #if defined(OS_LINUX) | 314 #if defined(OS_LINUX) |
| 314 should_initialize_gl_context = !initialized_gl_context && | 315 should_initialize_gl_context = !initialized_gl_context && |
| 315 !dead_on_arrival; | 316 !dead_on_arrival; |
| 316 | 317 |
| 317 if (!initialized_sandbox) { | 318 if (!initialized_sandbox) { |
| 318 gpu_info.sandboxed = StartSandboxLinux(gpu_info, watchdog_thread.get(), | 319 gpu_info.sandboxed = StartSandboxLinux(gpu_info, watchdog_thread.get(), |
| 319 should_initialize_gl_context); | 320 should_initialize_gl_context); |
| 320 } | 321 } |
| 321 #elif defined(OS_WIN) | 322 #elif defined(OS_WIN) |
| 322 gpu_info.sandboxed = StartSandboxWindows(parameters.sandbox_info); | 323 gpu_info.sandboxed = StartSandboxWindows(parameters.sandbox_info); |
| 324 #elif defined(OS_MACOSX) |
| 325 gpu_info.sandboxed = Sandbox::SandboxIsCurrentlyActive(); |
| 323 #endif | 326 #endif |
| 324 } else { | 327 } else { |
| 325 dead_on_arrival = true; | 328 dead_on_arrival = true; |
| 326 } | 329 } |
| 327 | 330 |
| 328 logging::SetLogMessageHandler(NULL); | 331 logging::SetLogMessageHandler(NULL); |
| 329 | 332 |
| 330 GpuProcess gpu_process; | 333 GpuProcess gpu_process; |
| 331 | 334 |
| 332 // These UMA must be stored after GpuProcess is constructed as it | 335 // These UMA must be stored after GpuProcess is constructed as it |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 509 return true; | 512 return true; |
| 510 } | 513 } |
| 511 | 514 |
| 512 return false; | 515 return false; |
| 513 } | 516 } |
| 514 #endif // defined(OS_WIN) | 517 #endif // defined(OS_WIN) |
| 515 | 518 |
| 516 } // namespace. | 519 } // namespace. |
| 517 | 520 |
| 518 } // namespace content | 521 } // namespace content |
| OLD | NEW |