OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "content/gpu/gpu_child_thread.h" | 5 #include "content/gpu/gpu_child_thread.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/threading/worker_pool.h" | 11 #include "base/threading/worker_pool.h" |
12 #include "base/win/scoped_com_initializer.h" | 12 #include "base/win/scoped_com_initializer.h" |
13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
14 #include "content/common/child_process.h" | 14 #include "content/common/child_process.h" |
15 #include "content/common/content_client.h" | 15 #include "content/common/content_client.h" |
16 #include "content/common/content_switches.h" | |
17 #include "content/common/gpu/gpu_messages.h" | 16 #include "content/common/gpu/gpu_messages.h" |
| 17 #include "content/public/common/content_switches.h" |
18 #include "content/gpu/gpu_info_collector.h" | 18 #include "content/gpu/gpu_info_collector.h" |
19 #include "content/gpu/gpu_watchdog_thread.h" | 19 #include "content/gpu/gpu_watchdog_thread.h" |
20 #include "ipc/ipc_channel_handle.h" | 20 #include "ipc/ipc_channel_handle.h" |
21 #include "ui/gfx/gl/gl_implementation.h" | 21 #include "ui/gfx/gl/gl_implementation.h" |
22 | 22 |
23 const int kGpuTimeout = 10000; | 23 const int kGpuTimeout = 10000; |
24 | 24 |
25 namespace { | 25 namespace { |
26 | 26 |
27 bool GpuProcessLogMessageHandler(int severity, | 27 bool GpuProcessLogMessageHandler(int severity, |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 // Runs on the main thread. | 227 // Runs on the main thread. |
228 void GpuChildThread::SetDxDiagnostics(GpuChildThread* thread, | 228 void GpuChildThread::SetDxDiagnostics(GpuChildThread* thread, |
229 const DxDiagNode& node) { | 229 const DxDiagNode& node) { |
230 thread->gpu_info_.dx_diagnostics = node; | 230 thread->gpu_info_.dx_diagnostics = node; |
231 thread->gpu_info_.finalized = true; | 231 thread->gpu_info_.finalized = true; |
232 thread->collecting_dx_diagnostics_ = false; | 232 thread->collecting_dx_diagnostics_ = false; |
233 thread->Send(new GpuHostMsg_GraphicsInfoCollected(thread->gpu_info_)); | 233 thread->Send(new GpuHostMsg_GraphicsInfoCollected(thread->gpu_info_)); |
234 } | 234 } |
235 | 235 |
236 #endif | 236 #endif |
OLD | NEW |