| Index: components/mus/gles2/command_buffer_local.h
|
| diff --git a/components/mus/gles2/command_buffer_local.h b/components/mus/gles2/command_buffer_local.h
|
| index 14c48217c44a70890d7fbb11f1ce67de1b569b38..bc50bdff82300c015f47639198171a87b5a38146 100644
|
| --- a/components/mus/gles2/command_buffer_local.h
|
| +++ b/components/mus/gles2/command_buffer_local.h
|
| @@ -31,10 +31,9 @@
|
| class GLSurface;
|
| }
|
|
|
| -namespace mus {
|
| +namespace gles2 {
|
|
|
| class CommandBufferLocalClient;
|
| -class GpuState;
|
|
|
| // This class provides a thin wrapper around a CommandBufferService and a
|
| // GpuControl implementation to allow cc::Display to generate GL directly on
|
| @@ -43,7 +42,7 @@
|
| public:
|
| CommandBufferLocal(CommandBufferLocalClient* client,
|
| gfx::AcceleratedWidget widget,
|
| - const scoped_refptr<GpuState>& gpu_state);
|
| + const scoped_refptr<gles2::GpuState>& gpu_state);
|
| ~CommandBufferLocal() override;
|
|
|
| bool Initialize();
|
| @@ -84,7 +83,7 @@
|
| void OnSyncPointRetired();
|
|
|
| gfx::AcceleratedWidget widget_;
|
| - scoped_refptr<GpuState> gpu_state_;
|
| + scoped_refptr<gles2::GpuState> gpu_state_;
|
| scoped_ptr<gpu::CommandBufferService> command_buffer_;
|
| scoped_ptr<gpu::GpuScheduler> scheduler_;
|
| scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
|
| @@ -97,6 +96,6 @@
|
| DISALLOW_COPY_AND_ASSIGN(CommandBufferLocal);
|
| };
|
|
|
| -} // namespace mus
|
| +} // namespace gles2
|
|
|
| #endif // COMPONENTS_MUS_GLES2_COMMAND_BUFFER_LOCAL_H_
|
|
|