Fix thread checking logic in ContextProviderCommandBuffer

content/common/gpu/client/context_provider_command_buffer.cc

 // Copyright (c) 2013 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/context_provider_command_buffer.h"
 
 #include <set>
 #include <vector>
 
 #include "base/callback_helpers.h"
@@ skipping 50 matching lines @@
          context_thread_checker_.CalledOnValidThread());
 
   // Destroy references to the context3d_ before leaking it.
   if (WebContext3DNoChecks()->GetCommandBufferProxy())
     WebContext3DNoChecks()->GetCommandBufferProxy()->SetLock(nullptr);
   lost_context_callback_proxy_.reset();
 }
 
 
 CommandBufferProxyImpl* ContextProviderCommandBuffer::GetCommandBufferProxy() {
-  return WebContext3D()->GetCommandBufferProxy();
+  return WebContext3DNoChecks()->GetCommandBufferProxy();
 }
 
 WebGraphicsContext3DCommandBufferImpl*
 ContextProviderCommandBuffer::WebContext3D() {
   DCHECK(gr_interface_);
   DCHECK(gr_interface_->WebContext3D());
   DCHECK(lost_context_callback_proxy_);  // Is bound to thread.
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   return WebContext3DNoChecks();
@@ skipping 30 matching lines @@
   return true;
 }
 
 void ContextProviderCommandBuffer::DetachFromThread() {
   context_thread_checker_.DetachFromThread();
 }
 
 gpu::gles2::GLES2Interface* ContextProviderCommandBuffer::ContextGL() {
   DCHECK(lost_context_callback_proxy_);  // Is bound to thread.
 
-  return WebContext3DNoChecks()->GetImplementation();
+  return WebContext3D()->GetImplementation();
 }
 
 gpu::ContextSupport* ContextProviderCommandBuffer::ContextSupport() {
-  return WebContext3D()->GetContextSupport();
+  return WebContext3DNoChecks()->GetContextSupport();
 }
 
 class GrContext* ContextProviderCommandBuffer::GrContext() {
   DCHECK(lost_context_callback_proxy_);  // Is bound to thread.
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   if (gr_context_)
     return gr_context_->get();
 
   gr_context_.reset(new GrContextForWebGraphicsContext3D(gr_interface_));
 
   // If GlContext is already lost, also abandon the new GrContext.
   if (gr_context_->get() &&
       ContextGL()->GetGraphicsResetStatusKHR() != GL_NO_ERROR)
     gr_context_->get()->abandonContext();
 
   return gr_context_->get();
 }
 
 void ContextProviderCommandBuffer::InvalidateGrContext(uint32_t state) {
   if (gr_context_) {
     DCHECK(lost_context_callback_proxy_);  // Is bound to thread.
     DCHECK(context_thread_checker_.CalledOnValidThread());
     gr_context_->get()->resetContext(state);
   }
 }
 
 void ContextProviderCommandBuffer::SetupLock() {
-  WebContext3D()->GetCommandBufferProxy()->SetLock(&context_lock_);
+  WebContext3DNoChecks()->GetCommandBufferProxy()->SetLock(&context_lock_);

[piman, 2015/11/20 04:54:35]

I think this one should stay as WebContext3D(), because we need to setup the
lock on the thread it was bound to (otherwise unsafe things would happen).

 }
 
 base::Lock* ContextProviderCommandBuffer::GetLock() {
   return &context_lock_;
 }
 
 cc::ContextProvider::Capabilities
 ContextProviderCommandBuffer::ContextCapabilities() {
   DCHECK(lost_context_callback_proxy_);  // Is bound to thread.
   DCHECK(context_thread_checker_.CalledOnValidThread());
@@ skipping 31 matching lines @@
 
 void ContextProviderCommandBuffer::SetLostContextCallback(
     const LostContextCallback& lost_context_callback) {
   DCHECK(context_thread_checker_.CalledOnValidThread());
   DCHECK(lost_context_callback_.is_null() ||
          lost_context_callback.is_null());
   lost_context_callback_ = lost_context_callback;
 }
 
 }  // namespace content