| Index: components/mus/surfaces/surfaces_context_provider.h
|
| diff --git a/components/mus/surfaces/surfaces_context_provider.h b/components/mus/surfaces/surfaces_context_provider.h
|
| index 493fa0dd8a6ab149b61b6cf7445c621cb08c783b..d0ff5bf4bec40c1636cb460ad65b88dfdf955c2d 100644
|
| --- a/components/mus/surfaces/surfaces_context_provider.h
|
| +++ b/components/mus/surfaces/surfaces_context_provider.h
|
| @@ -23,24 +23,21 @@ class GLES2Implementation;
|
|
|
| } // namespace gpu
|
|
|
| -namespace gles2 {
|
| +namespace mus {
|
| +
|
| class CommandBufferDriver;
|
| class CommandBufferImpl;
|
| class CommandBufferLocal;
|
| class GpuState;
|
| -}
|
| -
|
| -namespace surfaces {
|
| -
|
| class SurfacesContextProviderDelegate;
|
|
|
| class SurfacesContextProvider : public cc::ContextProvider,
|
| - public gles2::CommandBufferLocalClient,
|
| + public CommandBufferLocalClient,
|
| public base::NonThreadSafe {
|
| public:
|
| SurfacesContextProvider(SurfacesContextProviderDelegate* delegate,
|
| gfx::AcceleratedWidget widget,
|
| - const scoped_refptr<gles2::GpuState>& state);
|
| + const scoped_refptr<GpuState>& state);
|
|
|
| // cc::ContextProvider implementation.
|
| bool BindToCurrentThread() override;
|
| @@ -79,15 +76,15 @@ class SurfacesContextProvider : public cc::ContextProvider,
|
| LostContextCallback lost_context_callback_;
|
|
|
| SurfacesContextProviderDelegate* delegate_;
|
| - scoped_refptr<gles2::GpuState> state_;
|
| + scoped_refptr<GpuState> state_;
|
| gfx::AcceleratedWidget widget_;
|
| - scoped_ptr<gles2::CommandBufferLocal> command_buffer_local_;
|
| + scoped_ptr<CommandBufferLocal> command_buffer_local_;
|
|
|
| base::Lock context_lock_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SurfacesContextProvider);
|
| };
|
|
|
| -} // namespace surfaces
|
| +} // namespace mus
|
|
|
| #endif // COMPONENTS_MUS_SURFACES_SURFACES_CONTEXT_PROVIDER_H_
|
|
|