Chromium Code Reviews| Index: content/gpu/gpu_child_thread.h |
| diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h |
| index 597afef350594cb156c1d1b83d028d2f5a2ac258..c3c2731cdd9c1eaca950ea72f26cbb95e01b52b6 100644 |
| --- a/content/gpu/gpu_child_thread.h |
| +++ b/content/gpu/gpu_child_thread.h |
| @@ -64,13 +64,11 @@ class GpuChildThread : public ChildThreadImpl, |
| bool dead_on_arrival, |
| const gpu::GPUInfo& gpu_info, |
| const DeferredMessages& deferred_messages, |
| - gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory, |
| - gpu::SyncPointManager* sync_point_manager); |
| + gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory); |
| GpuChildThread(const gpu::GpuPreferences& gpu_preferences, |
| const InProcessChildThreadParams& params, |
| - gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory, |
| - gpu::SyncPointManager* sync_point_manager); |
| + gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory); |
| ~GpuChildThread() override; |
| @@ -162,8 +160,8 @@ class GpuChildThread : public ChildThreadImpl, |
| sandbox::TargetServices* target_services_; |
| #endif |
| - // Non-owning. |
| - gpu::SyncPointManager* sync_point_manager_; |
| + // Can be null if overridden by ContentGpuClient. |
|
piman
2016/04/22 00:50:43
nit: it can't be null - if ContentGpuClient doesn'
boliu
2016/04/22 01:08:36
It's the opposite case. If ContentGpuClient provid
piman
2016/04/22 04:05:08
Oh, I see - I misread the implementation because s
boliu
2016/04/22 04:41:15
Done. Also added a comment in .cc that manager fro
|
| + std::unique_ptr<gpu::SyncPointManager> sync_point_manager_; |
| std::unique_ptr<gpu::GpuChannelManager> gpu_channel_manager_; |