Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Side by Side Diff: content/gpu/gpu_child_thread.h

Issue 2654993004: Move GPU blacklist calculation to GPU proc (Closed)
Patch Set: cleanup Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "gpu/command_buffer/service/gpu_preferences.h" 22 #include "gpu/command_buffer/service/gpu_preferences.h"
23 #include "gpu/config/gpu_feature_status.h"
23 #include "gpu/config/gpu_info.h" 24 #include "gpu/config/gpu_info.h"
24 #include "gpu/ipc/service/gpu_channel.h" 25 #include "gpu/ipc/service/gpu_channel.h"
25 #include "gpu/ipc/service/gpu_channel_manager.h" 26 #include "gpu/ipc/service/gpu_channel_manager.h"
26 #include "gpu/ipc/service/gpu_channel_manager_delegate.h" 27 #include "gpu/ipc/service/gpu_channel_manager_delegate.h"
27 #include "gpu/ipc/service/gpu_config.h" 28 #include "gpu/ipc/service/gpu_config.h"
28 #include "gpu/ipc/service/x_util.h" 29 #include "gpu/ipc/service/x_util.h"
29 #include "mojo/public/cpp/bindings/binding_set.h" 30 #include "mojo/public/cpp/bindings/binding_set.h"
30 #include "services/service_manager/public/interfaces/service_factory.mojom.h" 31 #include "services/service_manager/public/interfaces/service_factory.mojom.h"
31 #include "services/ui/gpu/interfaces/gpu_main.mojom.h" 32 #include "services/ui/gpu/interfaces/gpu_main.mojom.h"
32 #include "ui/gfx/native_widget_types.h" 33 #include "ui/gfx/native_widget_types.h"
(...skipping 27 matching lines...) Expand all
60 struct LogMessage { 61 struct LogMessage {
61 int severity; 62 int severity;
62 std::string header; 63 std::string header;
63 std::string message; 64 std::string message;
64 }; 65 };
65 typedef std::queue<LogMessage> DeferredMessages; 66 typedef std::queue<LogMessage> DeferredMessages;
66 67
67 GpuChildThread(std::unique_ptr<gpu::GpuWatchdogThread> gpu_watchdog_thread, 68 GpuChildThread(std::unique_ptr<gpu::GpuWatchdogThread> gpu_watchdog_thread,
68 bool dead_on_arrival, 69 bool dead_on_arrival,
69 const gpu::GPUInfo& gpu_info, 70 const gpu::GPUInfo& gpu_info,
71 const gpu::GPUFeatureStatus& gpu_feature_status,
70 const DeferredMessages& deferred_messages, 72 const DeferredMessages& deferred_messages,
71 gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory); 73 gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory);
72 74
73 GpuChildThread(const InProcessChildThreadParams& params, 75 GpuChildThread(const InProcessChildThreadParams& params,
74 const gpu::GPUInfo& gpu_info, 76 const gpu::GPUInfo& gpu_info,
77 const gpu::GPUFeatureStatus& gpu_feature_status,
75 gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory); 78 gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory);
76 79
77 ~GpuChildThread() override; 80 ~GpuChildThread() override;
78 81
79 void Shutdown() override; 82 void Shutdown() override;
80 83
81 void Init(const base::Time& process_start_time); 84 void Init(const base::Time& process_start_time);
82 85
83 gpu::GpuWatchdogThread* watchdog_thread() { return watchdog_thread_.get(); } 86 gpu::GpuWatchdogThread* watchdog_thread() { return watchdog_thread_.get(); }
84 87
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 // Can be null if overridden by ContentGpuClient. 155 // Can be null if overridden by ContentGpuClient.
153 std::unique_ptr<gpu::SyncPointManager> owned_sync_point_manager_; 156 std::unique_ptr<gpu::SyncPointManager> owned_sync_point_manager_;
154 157
155 std::unique_ptr<gpu::GpuChannelManager> gpu_channel_manager_; 158 std::unique_ptr<gpu::GpuChannelManager> gpu_channel_manager_;
156 159
157 std::unique_ptr<media::MediaGpuChannelManager> media_gpu_channel_manager_; 160 std::unique_ptr<media::MediaGpuChannelManager> media_gpu_channel_manager_;
158 161
159 // Information about the GPU, such as device and vendor ID. 162 // Information about the GPU, such as device and vendor ID.
160 gpu::GPUInfo gpu_info_; 163 gpu::GPUInfo gpu_info_;
161 164
165 // The status of each GPU feature enumerated in gpu::GpuFeatureType.
166 gpu::GPUFeatureStatus gpu_feature_status_;
167
162 // Error messages collected in gpu_main() before the thread is created. 168 // Error messages collected in gpu_main() before the thread is created.
163 DeferredMessages deferred_messages_; 169 DeferredMessages deferred_messages_;
164 170
165 // Whether the GPU thread is running in the browser process. 171 // Whether the GPU thread is running in the browser process.
166 bool in_browser_process_; 172 bool in_browser_process_;
167 173
168 // The gpu::GpuMemoryBufferFactory instance used to allocate GpuMemoryBuffers. 174 // The gpu::GpuMemoryBufferFactory instance used to allocate GpuMemoryBuffers.
169 gpu::GpuMemoryBufferFactory* const gpu_memory_buffer_factory_; 175 gpu::GpuMemoryBufferFactory* const gpu_memory_buffer_factory_;
170 176
171 // ServiceFactory for service_manager::Service hosting. 177 // ServiceFactory for service_manager::Service hosting.
172 std::unique_ptr<GpuServiceFactory> service_factory_; 178 std::unique_ptr<GpuServiceFactory> service_factory_;
173 179
174 // Bindings to the service_manager::mojom::ServiceFactory impl. 180 // Bindings to the service_manager::mojom::ServiceFactory impl.
175 mojo::BindingSet<service_manager::mojom::ServiceFactory> 181 mojo::BindingSet<service_manager::mojom::ServiceFactory>
176 service_factory_bindings_; 182 service_factory_bindings_;
177 183
178 DISALLOW_COPY_AND_ASSIGN(GpuChildThread); 184 DISALLOW_COPY_AND_ASSIGN(GpuChildThread);
179 }; 185 };
180 186
181 } // namespace content 187 } // namespace content
182 188
183 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_ 189 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698