| 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() {
|
|
|