cc: Implement shared worker contexts. (v1)

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 41 matching lines @@
     : context3d_(context3d.Pass()),
       context_type_(type),
       debug_name_(CommandBufferContextTypeToString(type)),
       destroyed_(false) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   DCHECK(context3d_);
   context_thread_checker_.DetachFromThread();
 }
 
 ContextProviderCommandBuffer::~ContextProviderCommandBuffer() {
-  DCHECK(main_thread_checker_.CalledOnValidThread() ||
-         context_thread_checker_.CalledOnValidThread());
-
   base::AutoLock lock(main_thread_lock_);
-
-  // Destroy references to the context3d_ before leaking it.
-  if (context3d_->GetCommandBufferProxy()) {
-    context3d_->GetCommandBufferProxy()->SetLock(nullptr);
-    context3d_->GetCommandBufferProxy()->SetMemoryAllocationChangedCallback(
-        CommandBufferProxyImpl::MemoryAllocationChangedCallback());
-  }
-  lost_context_callback_proxy_.reset();
+  DestroyWithMainThreadLockAcquired();
 }
 
 
 CommandBufferProxyImpl* ContextProviderCommandBuffer::GetCommandBufferProxy() {
   return context3d_->GetCommandBufferProxy();
 }
 
+void ContextProviderCommandBuffer::Destroy() {
+  DCHECK(context_thread_checker_.CalledOnValidThread());
+
+  base::AutoLock lock(main_thread_lock_);
+  DestroyWithMainThreadLockAcquired();
+}
+
 WebGraphicsContext3DCommandBufferImpl*
 ContextProviderCommandBuffer::WebContext3D() {
   DCHECK(context3d_);
   DCHECK(lost_context_callback_proxy_);  // Is bound to thread.
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   return context3d_.get();
 }
 
 bool ContextProviderCommandBuffer::BindToCurrentThread() {
@@ skipping 149 matching lines @@
   memory_policy_changed_callback_ = memory_policy_changed_callback;
 
   if (!memory_policy_changed_callback_.is_null()) {
     DCHECK(context3d_->GetCommandBufferProxy());
     context3d_->GetCommandBufferProxy()->SetMemoryAllocationChangedCallback(
         base::Bind(&ContextProviderCommandBuffer::OnMemoryAllocationChanged,
                    base::Unretained(this)));
   }
 }
 
+bool ContextProviderCommandBuffer::HasBeenDestroyed() {

[piman, 2015/09/04 22:19:13]

I think you need to acquire main_thread_lock_ here.

Also, can you assert that if there is a context lock, it must be acquired?

+  DCHECK(context_thread_checker_.CalledOnValidThread());
+  return destroyed_;
+}
+
+void ContextProviderCommandBuffer::DestroyWithMainThreadLockAcquired() {
+  main_thread_lock_.AssertAcquired();
+
+  if (context3d_->GetCommandBufferProxy()) {

[piman, 2015/09/04 22:19:13]

Can we assert that if there is a context lock, it must be acquired?

+    context3d_->GetCommandBufferProxy()->SetLock(nullptr);
+    context3d_->GetCommandBufferProxy()->SetMemoryAllocationChangedCallback(
+        CommandBufferProxyImpl::MemoryAllocationChangedCallback());
+  }
+  lost_context_callback_proxy_.reset();
+  gr_context_.reset();
+  context3d_.reset();
+
+  destroyed_ = true;
+}
+
 }  // namespace content