| Index: ui/gfx/gl/gl_context_linux.cc
|
| ===================================================================
|
| --- ui/gfx/gl/gl_context_linux.cc (revision 85357)
|
| +++ ui/gfx/gl/gl_context_linux.cc (working copy)
|
| @@ -20,33 +20,24 @@
|
|
|
| namespace gfx {
|
|
|
| -GLContext* GLContext::CreateGLContext(GLSurface* compatible_surface,
|
| - GLContext* shared_context) {
|
| - scoped_ptr<GLSurface> surface(compatible_surface);
|
| -
|
| +GLContext* GLContext::CreateGLContext(GLContext* shared_context) {
|
| switch (GetGLImplementation()) {
|
| case kGLImplementationOSMesaGL: {
|
| - scoped_ptr<GLContextOSMesa> context(
|
| - new GLContextOSMesa(static_cast<GLSurfaceOSMesa*>(
|
| - surface.release())));
|
| + scoped_ptr<GLContextOSMesa> context(new GLContextOSMesa);
|
| if (!context->Initialize(OSMESA_RGBA, shared_context))
|
| return NULL;
|
|
|
| return context.release();
|
| }
|
| case kGLImplementationEGLGLES2: {
|
| - scoped_ptr<GLContextEGL> context(
|
| - new GLContextEGL(
|
| - static_cast<GLSurfaceEGL*>(surface.release())));
|
| + scoped_ptr<GLContextEGL> context(new GLContextEGL);
|
| if (!context->Initialize(shared_context))
|
| return NULL;
|
|
|
| return context.release();
|
| }
|
| case kGLImplementationDesktopGL: {
|
| - scoped_ptr<GLContextGLX> context(
|
| - new GLContextGLX(
|
| - static_cast<GLSurfaceGLX*>(surface.release())));
|
| + scoped_ptr<GLContextGLX> context(new GLContextGLX);
|
| if (!context->Initialize(shared_context))
|
| return NULL;
|
|
|
|
|