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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
357 if (!initialized_sandbox) { | 357 if (!initialized_sandbox) { |
358 gpu_info.sandboxed = StartSandboxLinux(gpu_info, watchdog_thread.get(), | 358 gpu_info.sandboxed = StartSandboxLinux(gpu_info, watchdog_thread.get(), |
359 should_initialize_gl_context); | 359 should_initialize_gl_context); |
360 } | 360 } |
361 #elif defined(OS_WIN) | 361 #elif defined(OS_WIN) |
362 gpu_info.sandboxed = StartSandboxWindows(parameters.sandbox_info); | 362 gpu_info.sandboxed = StartSandboxWindows(parameters.sandbox_info); |
363 #elif defined(OS_MACOSX) | 363 #elif defined(OS_MACOSX) |
364 gpu_info.sandboxed = Sandbox::SandboxIsCurrentlyActive(); | 364 gpu_info.sandboxed = Sandbox::SandboxIsCurrentlyActive(); |
365 #endif | 365 #endif |
366 | 366 |
367 gpu_info.video_decode_accelerator_supported_profiles = | 367 gpu_info.video_decode_accelerator_capabilities = |
368 content::GpuVideoDecodeAccelerator::GetSupportedProfiles(); | 368 content::GpuVideoDecodeAccelerator::GetCapabilities(); |
369 gpu_info.video_encode_accelerator_supported_profiles = | 369 gpu_info.video_encode_accelerator_supported_profiles = |
370 content::GpuVideoEncodeAccelerator::GetSupportedProfiles(); | 370 content::GpuVideoEncodeAccelerator::GetSupportedProfiles(); |
371 gpu_info.jpeg_decode_accelerator_supported = | 371 gpu_info.jpeg_decode_accelerator_supported = |
372 content::GpuJpegDecodeAccelerator::IsSupported(); | 372 content::GpuJpegDecodeAccelerator::IsSupported(); |
373 } else { | 373 } else { |
374 dead_on_arrival = true; | 374 dead_on_arrival = true; |
375 } | 375 } |
376 | 376 |
377 logging::SetLogMessageHandler(NULL); | 377 logging::SetLogMessageHandler(NULL); |
378 | 378 |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
576 return true; | 576 return true; |
577 } | 577 } |
578 | 578 |
579 return false; | 579 return false; |
580 } | 580 } |
581 #endif // defined(OS_WIN) | 581 #endif // defined(OS_WIN) |
582 | 582 |
583 } // namespace. | 583 } // namespace. |
584 | 584 |
585 } // namespace content | 585 } // namespace content |
OLD | NEW |