diff options
author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 21:53:38 +0000 |
---|---|---|
committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 21:53:38 +0000 |
commit | 0b7a2fff445beb2c5de1e2a632540a4107e00708 (patch) | |
tree | 759f7a9d489b6bf44c9f5de081d7bf335233028d /ui/gfx/gl/gl_context_mac.cc | |
parent | 72ab1b792dbddfb680490153984b1865b725d8f4 (diff) | |
download | chromium_src-0b7a2fff445beb2c5de1e2a632540a4107e00708.zip chromium_src-0b7a2fff445beb2c5de1e2a632540a4107e00708.tar.gz chromium_src-0b7a2fff445beb2c5de1e2a632540a4107e00708.tar.bz2 |
Revert 87371 - Broke Compile - Support for glSetSurfaceCHROMIUM.
This command allows a previously created GPU surface to be made current for a command buffer. There are no surfaces registered at this point so this command is currently a no-op.
Review URL: http://codereview.chromium.org/7077001
TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/7027008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/gl/gl_context_mac.cc')
-rw-r--r-- | ui/gfx/gl/gl_context_mac.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ui/gfx/gl/gl_context_mac.cc b/ui/gfx/gl/gl_context_mac.cc index 482d93d..5627d2c 100644 --- a/ui/gfx/gl/gl_context_mac.cc +++ b/ui/gfx/gl/gl_context_mac.cc @@ -16,23 +16,22 @@ namespace gfx { -scoped_refptr<GLContext> GLContext::CreateGLContext( - GLContext* shared_context, - GLSurface* compatible_surface) { +GLContext* GLContext::CreateGLContext(GLContext* shared_context, + GLSurface* compatible_surface) { switch (GetGLImplementation()) { case kGLImplementationDesktopGL: { - scoped_refptr<GLContext> context(new GLContextCGL); + scoped_ptr<GLContextCGL> context(new GLContextCGL); if (!context->Initialize(shared_context, compatible_surface)) return NULL; - return context; + return context.release(); } case kGLImplementationOSMesaGL: { - scoped_refptr<GLContext> context(new GLContextOSMesa); + scoped_ptr<GLContextOSMesa> context(new GLContextOSMesa); if (!context->Initialize(shared_context, compatible_surface)) return NULL; - return context; + return context.release(); } case kGLImplementationMockGL: return new GLContextStub; |