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 "content/gpu/gpu_child_thread.h" | 5 #include "content/gpu/gpu_child_thread.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
9 #include "base/threading/worker_pool.h" | 9 #include "base/threading/worker_pool.h" |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
11 #include "content/child/child_process.h" | 11 #include "content/child/child_process.h" |
12 #include "content/child/thread_safe_sender.h" | 12 #include "content/child/thread_safe_sender.h" |
13 #include "content/common/gpu/gpu_messages.h" | 13 #include "content/common/gpu/gpu_messages.h" |
14 #include "content/gpu/gpu_watchdog_thread.h" | 14 #include "content/gpu/gpu_watchdog_thread.h" |
15 #include "content/public/common/content_client.h" | 15 #include "content/public/common/content_client.h" |
16 #include "content/public/common/content_switches.h" | 16 #include "content/public/common/content_switches.h" |
17 #include "gpu/config/gpu_info_collector.h" | 17 #include "gpu/config/gpu_info_collector.h" |
18 #include "ipc/ipc_channel_handle.h" | 18 #include "ipc/ipc_channel_handle.h" |
19 #include "ipc/ipc_sync_message_filter.h" | 19 #include "ipc/ipc_sync_message_filter.h" |
20 #include "ui/gl/gl_implementation.h" | 20 #include "ui/gl/gl_implementation.h" |
21 | 21 |
22 #if defined(USE_OZONE) | 22 #if defined(USE_OZONE) |
23 #include "ui/ozone/ozone_platform.h" | |
24 #include "ui/ozone/public/gpu_platform_support.h" | 23 #include "ui/ozone/public/gpu_platform_support.h" |
| 24 #include "ui/ozone/public/ozone_platform.h" |
25 #endif | 25 #endif |
26 | 26 |
27 namespace content { | 27 namespace content { |
28 namespace { | 28 namespace { |
29 | 29 |
30 static base::LazyInstance<scoped_refptr<ThreadSafeSender> > | 30 static base::LazyInstance<scoped_refptr<ThreadSafeSender> > |
31 g_thread_safe_sender = LAZY_INSTANCE_INITIALIZER; | 31 g_thread_safe_sender = LAZY_INSTANCE_INITIALIZER; |
32 | 32 |
33 bool GpuProcessLogMessageHandler(int severity, | 33 bool GpuProcessLogMessageHandler(int severity, |
34 const char* file, int line, | 34 const char* file, int line, |
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 // the future posting of tasks to the message loop. | 256 // the future posting of tasks to the message loop. |
257 if (watchdog_thread_->message_loop()) | 257 if (watchdog_thread_->message_loop()) |
258 watchdog_thread_->PostAcknowledge(); | 258 watchdog_thread_->PostAcknowledge(); |
259 // Prevent rearming. | 259 // Prevent rearming. |
260 watchdog_thread_->Stop(); | 260 watchdog_thread_->Stop(); |
261 } | 261 } |
262 } | 262 } |
263 | 263 |
264 } // namespace content | 264 } // namespace content |
265 | 265 |
OLD | NEW |