| Index: ui/gl/scoped_make_current.h
|
| diff --git a/ui/gl/scoped_make_current.h b/ui/gl/scoped_make_current.h
|
| index ce4c7a8d55d6122101d542559d29bc680eb51bb3..fb25fc08ce28cc8bca3bb1215e605e5c14849ab1 100644
|
| --- a/ui/gl/scoped_make_current.h
|
| +++ b/ui/gl/scoped_make_current.h
|
| @@ -9,7 +9,7 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "ui/gl/gl_export.h"
|
|
|
| -namespace gfx {
|
| +namespace gl {
|
| class GLContext;
|
| class GLSurface;
|
| }
|
| @@ -18,16 +18,16 @@ namespace ui {
|
|
|
| class GL_EXPORT ScopedMakeCurrent {
|
| public:
|
| - ScopedMakeCurrent(gfx::GLContext* context, gfx::GLSurface* surface);
|
| + ScopedMakeCurrent(gl::GLContext* context, gl::GLSurface* surface);
|
| ~ScopedMakeCurrent();
|
|
|
| bool Succeeded() const;
|
|
|
| private:
|
| - scoped_refptr<gfx::GLContext> previous_context_;
|
| - scoped_refptr<gfx::GLSurface> previous_surface_;
|
| - scoped_refptr<gfx::GLContext> context_;
|
| - scoped_refptr<gfx::GLSurface> surface_;
|
| + scoped_refptr<gl::GLContext> previous_context_;
|
| + scoped_refptr<gl::GLSurface> previous_surface_;
|
| + scoped_refptr<gl::GLContext> context_;
|
| + scoped_refptr<gl::GLSurface> surface_;
|
| bool succeeded_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ScopedMakeCurrent);
|
|
|