| 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 #ifndef CONTENT_GPU_GPU_CHILD_THREAD_H_ | 5 #ifndef CONTENT_GPU_GPU_CHILD_THREAD_H_ |
| 6 #define CONTENT_GPU_GPU_CHILD_THREAD_H_ | 6 #define CONTENT_GPU_GPU_CHILD_THREAD_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> |
| 10 #include <queue> | 11 #include <queue> |
| 11 #include <string> | 12 #include <string> |
| 12 | 13 |
| 13 #include "base/command_line.h" | 14 #include "base/command_line.h" |
| 14 #include "base/macros.h" | 15 #include "base/macros.h" |
| 15 #include "base/memory/ref_counted.h" | 16 #include "base/memory/ref_counted.h" |
| 16 #include "base/memory/scoped_ptr.h" | |
| 17 #include "base/time/time.h" | 17 #include "base/time/time.h" |
| 18 #include "build/build_config.h" | 18 #include "build/build_config.h" |
| 19 #include "content/child/child_thread_impl.h" | 19 #include "content/child/child_thread_impl.h" |
| 20 #include "content/common/process_control.mojom.h" | 20 #include "content/common/process_control.mojom.h" |
| 21 #include "gpu/command_buffer/service/gpu_preferences.h" | 21 #include "gpu/command_buffer/service/gpu_preferences.h" |
| 22 #include "gpu/config/gpu_info.h" | 22 #include "gpu/config/gpu_info.h" |
| 23 #include "gpu/ipc/service/gpu_channel.h" | 23 #include "gpu/ipc/service/gpu_channel.h" |
| 24 #include "gpu/ipc/service/gpu_channel_manager.h" | 24 #include "gpu/ipc/service/gpu_channel_manager.h" |
| 25 #include "gpu/ipc/service/gpu_channel_manager_delegate.h" | 25 #include "gpu/ipc/service/gpu_channel_manager_delegate.h" |
| 26 #include "gpu/ipc/service/gpu_config.h" | 26 #include "gpu/ipc/service/gpu_config.h" |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 scoped_refptr<GpuWatchdogThread> watchdog_thread_; | 158 scoped_refptr<GpuWatchdogThread> watchdog_thread_; |
| 159 | 159 |
| 160 #if defined(OS_WIN) | 160 #if defined(OS_WIN) |
| 161 // Windows specific client sandbox interface. | 161 // Windows specific client sandbox interface. |
| 162 sandbox::TargetServices* target_services_; | 162 sandbox::TargetServices* target_services_; |
| 163 #endif | 163 #endif |
| 164 | 164 |
| 165 // Non-owning. | 165 // Non-owning. |
| 166 gpu::SyncPointManager* sync_point_manager_; | 166 gpu::SyncPointManager* sync_point_manager_; |
| 167 | 167 |
| 168 scoped_ptr<gpu::GpuChannelManager> gpu_channel_manager_; | 168 std::unique_ptr<gpu::GpuChannelManager> gpu_channel_manager_; |
| 169 | 169 |
| 170 scoped_ptr<MediaService> media_service_; | 170 std::unique_ptr<MediaService> media_service_; |
| 171 | 171 |
| 172 // Information about the GPU, such as device and vendor ID. | 172 // Information about the GPU, such as device and vendor ID. |
| 173 gpu::GPUInfo gpu_info_; | 173 gpu::GPUInfo gpu_info_; |
| 174 | 174 |
| 175 // Error messages collected in gpu_main() before the thread is created. | 175 // Error messages collected in gpu_main() before the thread is created. |
| 176 DeferredMessages deferred_messages_; | 176 DeferredMessages deferred_messages_; |
| 177 | 177 |
| 178 // Whether the GPU thread is running in the browser process. | 178 // Whether the GPU thread is running in the browser process. |
| 179 bool in_browser_process_; | 179 bool in_browser_process_; |
| 180 | 180 |
| 181 // The gpu::GpuMemoryBufferFactory instance used to allocate GpuMemoryBuffers. | 181 // The gpu::GpuMemoryBufferFactory instance used to allocate GpuMemoryBuffers. |
| 182 gpu::GpuMemoryBufferFactory* const gpu_memory_buffer_factory_; | 182 gpu::GpuMemoryBufferFactory* const gpu_memory_buffer_factory_; |
| 183 | 183 |
| 184 // Process control for Mojo application hosting. | 184 // Process control for Mojo application hosting. |
| 185 scoped_ptr<GpuProcessControlImpl> process_control_; | 185 std::unique_ptr<GpuProcessControlImpl> process_control_; |
| 186 | 186 |
| 187 // Bindings to the mojom::ProcessControl impl. | 187 // Bindings to the mojom::ProcessControl impl. |
| 188 mojo::BindingSet<mojom::ProcessControl> process_control_bindings_; | 188 mojo::BindingSet<mojom::ProcessControl> process_control_bindings_; |
| 189 | 189 |
| 190 DISALLOW_COPY_AND_ASSIGN(GpuChildThread); | 190 DISALLOW_COPY_AND_ASSIGN(GpuChildThread); |
| 191 }; | 191 }; |
| 192 | 192 |
| 193 } // namespace content | 193 } // namespace content |
| 194 | 194 |
| 195 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_ | 195 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_ |
| OLD | NEW |