diff options
Diffstat (limited to 'ui/gfx/compositor/compositor_gl.cc')
| -rw-r--r-- | ui/gfx/compositor/compositor_gl.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/ui/gfx/compositor/compositor_gl.cc b/ui/gfx/compositor/compositor_gl.cc index 4beb65c..fa8e100 100644 --- a/ui/gfx/compositor/compositor_gl.cc +++ b/ui/gfx/compositor/compositor_gl.cc @@ -9,9 +9,10 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/transform.h" -#include "ui/gfx/gl/gl_context.h" #include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_context.h" #include "ui/gfx/gl/gl_implementation.h" +#include "ui/gfx/gl/gl_surface.h" namespace ui { @@ -38,8 +39,10 @@ class CompositorGL : public Compositor { }; CompositorGL::CompositorGL(gfx::AcceleratedWidget widget) - : gl_context_(gfx::GLContext::CreateViewGLContext(widget, false)), - started_(false) { + : started_(false) { + scoped_ptr<gfx::GLSurface> surface( + gfx::GLSurface::CreateViewGLSurface(widget)); + gl_context_.reset(gfx::GLContext::CreateGLContext(surface.release(), NULL)), } Texture* CompositorGL::CreateTexture() { @@ -89,8 +92,10 @@ class CompositorGL : public Compositor { }; CompositorGL::CompositorGL(gfx::AcceleratedWidget widget) - : gl_context_(gfx::GLContext::CreateViewGLContext(widget, false)), - started_(false) { + : started_(false) { + scoped_ptr<gfx::GLSurface> surface( + gfx::GLSurface::CreateViewGLSurface(widget)); + gl_context_.reset(gfx::GLContext::CreateGLContext(surface.release(), NULL)); } void CompositorGL::NotifyStart() { |