Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Unified Diff: ui/gfx/gl/gl_context_linux.cc

Issue 7021014: GLContext no longer holds a pointer to a GLSurface. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698