| Index: mojo/gpu/gl_context.h
|
| diff --git a/mojo/gpu/gl_context.h b/mojo/gpu/gl_context.h
|
| index d8197a51aafda23c6c8b6091fccd18c381f0b6b2..2ccdaaddafe88014f5109283e8942f4eaa474e8a 100644
|
| --- a/mojo/gpu/gl_context.h
|
| +++ b/mojo/gpu/gl_context.h
|
| @@ -5,23 +5,15 @@
|
| #ifndef MOJO_GPU_GL_CONTEXT_H_
|
| #define MOJO_GPU_GL_CONTEXT_H_
|
|
|
| -#include <MGL/mgl.h>
|
| -
|
| #include "base/basictypes.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| +#include "mojo/public/c/gpu/MGL/mgl.h"
|
| #include "mojo/public/cpp/bindings/interface_ptr.h"
|
|
|
| -namespace gpu {
|
| -namespace gles2 {
|
| -class GLES2Interface;
|
| -}
|
| -}
|
| -
|
| namespace mojo {
|
| class CommandBuffer;
|
| using CommandBufferPtr = InterfacePtr<CommandBuffer>;
|
| -class MojoGLES2Impl;
|
| class Shell;
|
|
|
| class GLContext {
|
| @@ -39,10 +31,9 @@ class GLContext {
|
| CommandBufferPtr command_buffer);
|
|
|
| void MakeCurrent();
|
| + bool IsCurrent();
|
| void Destroy();
|
|
|
| - gpu::gles2::GLES2Interface* gl() const;
|
| -
|
| void AddObserver(Observer* observer);
|
| void RemoveObserver(Observer* observer);
|
|
|
| @@ -54,7 +45,6 @@ class GLContext {
|
| void OnContextLost();
|
|
|
| MGLContext context_;
|
| - scoped_ptr<MojoGLES2Impl> gl_impl_;
|
|
|
| base::ObserverList<Observer> observers_;
|
| base::WeakPtrFactory<GLContext> weak_factory_;
|
|
|