| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/gpu/gpu_thread.h" | 5 #include "chrome/gpu/gpu_thread.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "app/gfx/gl/gl_context.h" | 10 #include "app/gfx/gl/gl_context.h" |
| 11 #include "app/gfx/gl/gl_implementation.h" | 11 #include "app/gfx/gl/gl_implementation.h" |
| 12 #include "app/win/scoped_com_initializer.h" | 12 #include "app/win/scoped_com_initializer.h" |
| 13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
| 14 #include "base/threading/worker_pool.h" | 14 #include "base/threading/worker_pool.h" |
| 15 #include "build/build_config.h" | 15 #include "build/build_config.h" |
| 16 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
| 17 #include "chrome/common/gpu_messages.h" | |
| 18 #include "chrome/gpu/gpu_info_collector.h" | 17 #include "chrome/gpu/gpu_info_collector.h" |
| 19 #include "chrome/gpu/gpu_watchdog_thread.h" | 18 #include "chrome/gpu/gpu_watchdog_thread.h" |
| 20 #include "content/common/child_process.h" | 19 #include "content/common/child_process.h" |
| 21 #include "content/common/content_client.h" | 20 #include "content/common/content_client.h" |
| 21 #include "content/common/gpu_messages.h" |
| 22 #include "ipc/ipc_channel_handle.h" | 22 #include "ipc/ipc_channel_handle.h" |
| 23 | 23 |
| 24 #if defined(OS_MACOSX) | 24 #if defined(OS_MACOSX) |
| 25 #include "chrome/common/sandbox_init_wrapper.h" | 25 #include "chrome/common/sandbox_init_wrapper.h" |
| 26 #include "chrome/common/sandbox_mac.h" | 26 #include "chrome/common/sandbox_mac.h" |
| 27 #elif defined(OS_WIN) | 27 #elif defined(OS_WIN) |
| 28 #include "sandbox/src/sandbox.h" | 28 #include "sandbox/src/sandbox.h" |
| 29 #endif | 29 #endif |
| 30 | 30 |
| 31 const int kGpuTimeout = 10000; | 31 const int kGpuTimeout = 10000; |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 } | 338 } |
| 339 | 339 |
| 340 // Runs on the GPU thread. | 340 // Runs on the GPU thread. |
| 341 void GpuThread::SetDxDiagnostics(GpuThread* thread, const DxDiagNode& node) { | 341 void GpuThread::SetDxDiagnostics(GpuThread* thread, const DxDiagNode& node) { |
| 342 thread->gpu_info_.dx_diagnostics = node; | 342 thread->gpu_info_.dx_diagnostics = node; |
| 343 thread->gpu_info_.level = GPUInfo::kComplete; | 343 thread->gpu_info_.level = GPUInfo::kComplete; |
| 344 thread->Send(new GpuHostMsg_GraphicsInfoCollected(thread->gpu_info_)); | 344 thread->Send(new GpuHostMsg_GraphicsInfoCollected(thread->gpu_info_)); |
| 345 } | 345 } |
| 346 | 346 |
| 347 #endif | 347 #endif |
| OLD | NEW |