| Index: gpu/command_buffer/service/gpu_scheduler.h
|
| diff --git a/gpu/command_buffer/service/gpu_scheduler.h b/gpu/command_buffer/service/gpu_scheduler.h
|
| index f7fd49eed66fa221aa968b79161b1c065b377b6a..3a33da4028fa412333fbfb1a88d090f83fc6bf68 100644
|
| --- a/gpu/command_buffer/service/gpu_scheduler.h
|
| +++ b/gpu/command_buffer/service/gpu_scheduler.h
|
| @@ -28,8 +28,8 @@ class GpuScheduler
|
| public base::SupportsWeakPtr<GpuScheduler> {
|
| public:
|
| GpuScheduler(CommandBuffer* command_buffer,
|
| - gles2::GLES2Decoder* decoder,
|
| - CommandParser* parser);
|
| + AsyncAPIInterface* handler,
|
| + gles2::GLES2Decoder* decoder);
|
|
|
| virtual ~GpuScheduler();
|
|
|
| @@ -62,6 +62,10 @@ class GpuScheduler
|
|
|
| void DeferToFence(base::Closure task);
|
|
|
| + CommandParser* parser() const {
|
| + return parser_.get();
|
| + }
|
| +
|
| private:
|
| // Polls the fences, invoking callbacks that were waiting to be triggered
|
| // by them and returns whether all fences were complete.
|
| @@ -72,6 +76,9 @@ class GpuScheduler
|
| // through the ProcessCommands callback.
|
| CommandBuffer* command_buffer_;
|
|
|
| + // The parser uses this to execute commands.
|
| + AsyncAPIInterface* handler_;
|
| +
|
| // Does not own decoder. TODO(apatrick): The GpuScheduler shouldn't need a
|
| // pointer to the decoder, it is only used to initialize the CommandParser,
|
| // which could be an argument to the constructor, and to determine the
|
| @@ -98,6 +105,8 @@ class GpuScheduler
|
|
|
| base::Closure scheduled_callback_;
|
| base::Closure command_processed_callback_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(GpuScheduler);
|
| };
|
|
|
| } // namespace gpu
|
|
|