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

Unified Diff: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.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: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
===================================================================
--- webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc (revision 85357)
+++ webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc (working copy)
@@ -138,8 +138,7 @@
if (!surface->Initialize())
return false;
- gl_context_.reset(gfx::GLContext::CreateGLContext(surface.release(),
- share_context));
+ gl_context_.reset(gfx::GLContext::CreateGLContext(share_context));
if (!gl_context_.get()) {
if (!is_gles2_)
return false;
@@ -155,9 +154,7 @@
surface.reset(gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(1, 1)));
- gl_context_.reset(gfx::GLContext::CreateGLContext(
- surface.release(),
- share_context));
+ gl_context_.reset(gfx::GLContext::CreateGLContext(share_context));
if (!gl_context_.get())
return false;
}
@@ -175,7 +172,7 @@
if (render_directly_to_web_view)
attributes_.antialias = false;
- if (!gl_context_->MakeCurrent()) {
+ if (!gl_context_->MakeCurrent(gl_surface_.get())) {
gl_context_.reset();
return false;
}
@@ -270,7 +267,7 @@
}
bool WebGraphicsContext3DInProcessCommandBufferImpl::makeContextCurrent() {
- return gl_context_->MakeCurrent();
+ return gl_context_->MakeCurrent(gl_surface_.get());
}
int WebGraphicsContext3DInProcessCommandBufferImpl::width() {

Powered by Google App Engine
This is Rietveld 408576698