| Index: gpu/ipc/service/gpu_channel_manager.h
|
| diff --git a/gpu/ipc/service/gpu_channel_manager.h b/gpu/ipc/service/gpu_channel_manager.h
|
| index 797dad1039489ef302cc37a86b450e334aae30e1..551ab499baa5d8cfbc4dc3c8a18531125158d826 100644
|
| --- a/gpu/ipc/service/gpu_channel_manager.h
|
| +++ b/gpu/ipc/service/gpu_channel_manager.h
|
| @@ -56,6 +56,7 @@ struct ChannelHandle;
|
| namespace gpu {
|
| class GpuChannel;
|
| class GpuChannelManagerDelegate;
|
| +class GpuScheduler;
|
| class GpuMemoryBufferFactory;
|
| class GpuWatchdogThread;
|
|
|
| @@ -180,8 +181,11 @@ class GPU_EXPORT GpuChannelManager {
|
| base::WaitableEvent* shutdown_event_;
|
|
|
| scoped_refptr<gl::GLShareGroup> share_group_;
|
| - scoped_refptr<gles2::MailboxManager> mailbox_manager_;
|
| +
|
| scoped_refptr<PreemptionFlag> preemption_flag_;
|
| + std::unique_ptr<GpuScheduler> scheduler_;
|
| +
|
| + scoped_refptr<gles2::MailboxManager> mailbox_manager_;
|
| GpuMemoryManager gpu_memory_manager_;
|
| // SyncPointManager guaranteed to outlive running MessageLoop.
|
| SyncPointManager* sync_point_manager_;
|
|
|