| 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 <memory> |
| 11 #include <queue> | 11 #include <queue> |
| 12 #include <string> | 12 #include <string> |
| 13 | 13 |
| 14 #include "base/callback.h" | 14 #include "base/callback.h" |
| 15 #include "base/command_line.h" | 15 #include "base/command_line.h" |
| 16 #include "base/macros.h" | 16 #include "base/macros.h" |
| 17 #include "base/memory/ref_counted.h" | 17 #include "base/memory/ref_counted.h" |
| 18 #include "base/metrics/field_trial.h" | 18 #include "base/metrics/field_trial.h" |
| 19 #include "base/time/time.h" | 19 #include "base/time/time.h" |
| 20 #include "build/build_config.h" | 20 #include "build/build_config.h" |
| 21 #include "content/child/child_thread_impl.h" | 21 #include "content/child/child_thread_impl.h" |
| 22 #include "content/common/associated_interface_registry_impl.h" | 22 #include "content/common/associated_interface_registry_impl.h" |
| 23 #include "gpu/command_buffer/service/gpu_preferences.h" | 23 #include "gpu/command_buffer/service/gpu_preferences.h" |
| 24 #include "gpu/config/gpu_feature_info.h" |
| 24 #include "gpu/config/gpu_info.h" | 25 #include "gpu/config/gpu_info.h" |
| 25 #include "gpu/ipc/service/gpu_channel.h" | 26 #include "gpu/ipc/service/gpu_channel.h" |
| 26 #include "gpu/ipc/service/gpu_channel_manager.h" | 27 #include "gpu/ipc/service/gpu_channel_manager.h" |
| 27 #include "gpu/ipc/service/gpu_channel_manager_delegate.h" | 28 #include "gpu/ipc/service/gpu_channel_manager_delegate.h" |
| 28 #include "gpu/ipc/service/gpu_config.h" | 29 #include "gpu/ipc/service/gpu_config.h" |
| 29 #include "gpu/ipc/service/x_util.h" | 30 #include "gpu/ipc/service/x_util.h" |
| 30 #include "mojo/public/cpp/bindings/associated_binding_set.h" | 31 #include "mojo/public/cpp/bindings/associated_binding_set.h" |
| 31 #include "mojo/public/cpp/bindings/binding_set.h" | 32 #include "mojo/public/cpp/bindings/binding_set.h" |
| 32 #include "services/service_manager/public/interfaces/service_factory.mojom.h" | 33 #include "services/service_manager/public/interfaces/service_factory.mojom.h" |
| 33 #include "services/ui/gpu/gpu_service.h" | 34 #include "services/ui/gpu/gpu_service.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 58 struct LogMessage { | 59 struct LogMessage { |
| 59 int severity; | 60 int severity; |
| 60 std::string header; | 61 std::string header; |
| 61 std::string message; | 62 std::string message; |
| 62 }; | 63 }; |
| 63 typedef std::queue<LogMessage> DeferredMessages; | 64 typedef std::queue<LogMessage> DeferredMessages; |
| 64 | 65 |
| 65 GpuChildThread(std::unique_ptr<gpu::GpuWatchdogThread> gpu_watchdog_thread, | 66 GpuChildThread(std::unique_ptr<gpu::GpuWatchdogThread> gpu_watchdog_thread, |
| 66 bool dead_on_arrival, | 67 bool dead_on_arrival, |
| 67 const gpu::GPUInfo& gpu_info, | 68 const gpu::GPUInfo& gpu_info, |
| 69 const gpu::GpuFeatureInfo& gpu_feature_info, |
| 68 const DeferredMessages& deferred_messages, | 70 const DeferredMessages& deferred_messages, |
| 69 gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory); | 71 gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory); |
| 70 | 72 |
| 71 GpuChildThread(const InProcessChildThreadParams& params, | 73 GpuChildThread(const InProcessChildThreadParams& params, |
| 72 const gpu::GPUInfo& gpu_info, | 74 const gpu::GPUInfo& gpu_info, |
| 75 const gpu::GpuFeatureInfo& gpu_feature_info, |
| 73 gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory); | 76 gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory); |
| 74 | 77 |
| 75 ~GpuChildThread() override; | 78 ~GpuChildThread() override; |
| 76 | 79 |
| 77 void Shutdown() override; | 80 void Shutdown() override; |
| 78 | 81 |
| 79 void Init(const base::Time& process_start_time); | 82 void Init(const base::Time& process_start_time); |
| 80 | 83 |
| 81 gpu::GpuWatchdogThread* watchdog_thread() { | 84 gpu::GpuWatchdogThread* watchdog_thread() { |
| 82 return gpu_service_->watchdog_thread(); | 85 return gpu_service_->watchdog_thread(); |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 AssociatedInterfaceRegistryImpl associated_interfaces_; | 171 AssociatedInterfaceRegistryImpl associated_interfaces_; |
| 169 std::unique_ptr<ui::GpuService> gpu_service_; | 172 std::unique_ptr<ui::GpuService> gpu_service_; |
| 170 mojo::AssociatedBinding<ui::mojom::GpuMain> gpu_main_binding_; | 173 mojo::AssociatedBinding<ui::mojom::GpuMain> gpu_main_binding_; |
| 171 | 174 |
| 172 DISALLOW_COPY_AND_ASSIGN(GpuChildThread); | 175 DISALLOW_COPY_AND_ASSIGN(GpuChildThread); |
| 173 }; | 176 }; |
| 174 | 177 |
| 175 } // namespace content | 178 } // namespace content |
| 176 | 179 |
| 177 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_ | 180 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_ |
| OLD | NEW |