| Index: ui/gfx/gl/gl_context_mac.cc
|
| ===================================================================
|
| --- ui/gfx/gl/gl_context_mac.cc (revision 85357)
|
| +++ ui/gfx/gl/gl_context_mac.cc (working copy)
|
| @@ -16,24 +16,17 @@
|
|
|
| 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 kGLImplementationDesktopGL: {
|
| - scoped_ptr<GLContextCGL> context(
|
| - new GLContextCGL(
|
| - static_cast<GLSurfaceCGL*>(surface.release())));
|
| + scoped_ptr<GLContextCGL> context(new GLContextCGL);
|
| if (!context->Initialize(shared_context))
|
| return NULL;
|
|
|
| return context.release();
|
| }
|
| 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;
|
|
|
|
|