| 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 <queue> | 10 #include <queue> |
| 11 #include <string> | 11 #include <string> |
| 12 | 12 |
| 13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "base/memory/ref_counted.h" | 15 #include "base/memory/ref_counted.h" |
| 16 #include "base/memory/scoped_ptr.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/gpu/gpu_channel.h" | 20 #include "content/common/gpu/gpu_channel.h" |
| 21 #include "content/common/gpu/gpu_channel_manager.h" | 21 #include "content/common/gpu/gpu_channel_manager.h" |
| 22 #include "content/common/gpu/gpu_channel_manager_delegate.h" | 22 #include "content/common/gpu/gpu_channel_manager_delegate.h" |
| 23 #include "content/common/gpu/gpu_config.h" | 23 #include "content/common/gpu/gpu_config.h" |
| 24 #include "content/common/gpu/x_util.h" | 24 #include "content/common/gpu/x_util.h" |
| 25 #include "content/common/process_control.mojom.h" | 25 #include "content/common/process_control.mojom.h" |
| 26 #include "gpu/config/gpu_info.h" | 26 #include "gpu/config/gpu_info.h" |
| 27 #include "mojo/public/cpp/bindings/binding_set.h" |
| 27 #include "mojo/public/cpp/bindings/interface_request.h" | 28 #include "mojo/public/cpp/bindings/interface_request.h" |
| 28 #include "mojo/public/cpp/bindings/weak_binding_set.h" | |
| 29 #include "ui/gfx/native_widget_types.h" | 29 #include "ui/gfx/native_widget_types.h" |
| 30 | 30 |
| 31 namespace gpu { | 31 namespace gpu { |
| 32 class SyncPointManager; | 32 class SyncPointManager; |
| 33 } | 33 } |
| 34 | 34 |
| 35 namespace sandbox { | 35 namespace sandbox { |
| 36 class TargetServices; | 36 class TargetServices; |
| 37 } | 37 } |
| 38 | 38 |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 // Whether the GPU thread is running in the browser process. | 156 // Whether the GPU thread is running in the browser process. |
| 157 bool in_browser_process_; | 157 bool in_browser_process_; |
| 158 | 158 |
| 159 // The GpuMemoryBufferFactory instance used to allocate GpuMemoryBuffers. | 159 // The GpuMemoryBufferFactory instance used to allocate GpuMemoryBuffers. |
| 160 GpuMemoryBufferFactory* const gpu_memory_buffer_factory_; | 160 GpuMemoryBufferFactory* const gpu_memory_buffer_factory_; |
| 161 | 161 |
| 162 // Process control for Mojo application hosting. | 162 // Process control for Mojo application hosting. |
| 163 scoped_ptr<GpuProcessControlImpl> process_control_; | 163 scoped_ptr<GpuProcessControlImpl> process_control_; |
| 164 | 164 |
| 165 // Bindings to the ProcessControl impl. | 165 // Bindings to the ProcessControl impl. |
| 166 mojo::WeakBindingSet<ProcessControl> process_control_bindings_; | 166 mojo::BindingSet<ProcessControl> process_control_bindings_; |
| 167 | 167 |
| 168 DISALLOW_COPY_AND_ASSIGN(GpuChildThread); | 168 DISALLOW_COPY_AND_ASSIGN(GpuChildThread); |
| 169 }; | 169 }; |
| 170 | 170 |
| 171 } // namespace content | 171 } // namespace content |
| 172 | 172 |
| 173 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_ | 173 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_ |
| OLD | NEW |