gpu: Remove WebGraphicsContext3D::makeContextCurrent()

content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 
 #include "third_party/khronos/GLES2/gl2.h"
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
@@ skipping 209 matching lines @@
       << command_buffer_->GetLastError();
   // Initialize the command buffer.
   bool result = command_buffer_->Initialize();
   LOG_IF(ERROR, !result) << "CommandBufferProxy::Initialize failed.";
   return result;
 }
 
 bool WebGraphicsContext3DCommandBufferImpl::CreateContext(bool onscreen) {
   TRACE_EVENT0("gpu", "WebGfxCtx3DCmdBfrImpl::CreateContext");
   // Ensure the gles2 library is initialized first in a thread safe way.
   g_gles2_initializer.Get();

[piman, 2014/08/15 17:47:34]

If we move out the ::gles2::SetGLContext, then we should move out the
g_gles2_initializer, which is only there to ensure we initialize the TLS
pointer.

 
   scoped_refptr<gpu::gles2::ShareGroup> gles2_share_group;
 
   scoped_ptr<base::AutoLock> share_group_lock;
   bool add_to_share_group = false;
   if (!command_buffer_) {
     WebGraphicsContext3DCommandBufferImpl* share_context = NULL;
 
     share_group_lock.reset(new base::AutoLock(share_group_->lock()));
     share_context = share_group_->GetAnyContextLocked();
@@ skipping 48 matching lines @@
     share_group_->AddContextLocked(this);
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableGpuClientTracing)) {
     trace_gl_.reset(new gpu::gles2::GLES2TraceImplementation(GetGLInterface()));
     setGLInterface(trace_gl_.get());
   }
   return true;
 }
 
-bool WebGraphicsContext3DCommandBufferImpl::makeContextCurrent() {
+bool WebGraphicsContext3DCommandBufferImpl::BindToCurrentThread() {
   if (!MaybeInitializeGL()) {
     DLOG(ERROR) << "Failed to initialize context.";
     return false;
   }
-  gles2::SetGLContext(GetGLInterface());
   if (gpu::error::IsError(command_buffer_->GetLastError())) {
     LOG(ERROR) << "Context dead on arrival. Last error: "
                << command_buffer_->GetLastError();
     return false;
   }
 
   return true;
 }
 
 void WebGraphicsContext3DCommandBufferImpl::Destroy() {
@@ skipping 107 matching lines @@
   share_group_->RemoveAllContexts();
 
   DCHECK(host_.get());
   {
     base::AutoLock lock(g_default_share_groups_lock.Get());
     g_default_share_groups.Get().erase(host_.get());
   }
 }
 
 }  // namespace content