Merge 139884 - Upon receiving OnError callback against a context, only clear the set of created con…

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 27 matching lines @@
 static base::LazyInstance<std::set<WebGraphicsContext3DCommandBufferImpl*> >
     g_all_shared_contexts = LAZY_INSTANCE_INITIALIZER;
 
 namespace {
 
 void ClearSharedContexts() {
   base::AutoLock lock(g_all_shared_contexts_lock.Get());
   g_all_shared_contexts.Pointer()->clear();
 }
 
+void ClearSharedContextsIfInShareSet(
+    WebGraphicsContext3DCommandBufferImpl* context) {
+  // If the given context isn't in the share set, that means that it
+  // or another context it was previously sharing with already
+  // provoked a lost context. Other contexts might have since been
+  // successfully created and added to the share set, so do not clear
+  // out the share set unless we know that all the contexts in there
+  // are supposed to be lost simultaneously.
+  base::AutoLock lock(g_all_shared_contexts_lock.Get());
+  std::set<WebGraphicsContext3DCommandBufferImpl*>* share_set =
+      g_all_shared_contexts.Pointer();
+  for (std::set<WebGraphicsContext3DCommandBufferImpl*>::iterator iter =
+           share_set->begin(); iter != share_set->end(); ++iter) {
+    if (context == *iter) {
+      share_set->clear();
+      return;
+    }
+  }
+}
+
 const int32 kCommandBufferSize = 1024 * 1024;
 // TODO(kbr): make the transfer buffer size configurable via context
 // creation attributes.
 const size_t kStartTransferBufferSize = 1 * 1024 * 1024;
 const size_t kMinTransferBufferSize = 1 * 256 * 1024;
 const size_t kMaxTransferBufferSize = 16 * 1024 * 1024;
 
 // Singleton used to initialize and terminate the gles2 library.
 class GLES2Initializer {
  public:
@@ skipping 75 matching lines @@
 
 WebGraphicsContext3DCommandBufferImpl::
     ~WebGraphicsContext3DCommandBufferImpl() {
   if (gl_) {
     gl_->SetErrorMessageCallback(NULL);
   }
 
   if (host_) {
     if (host_->WillGpuSwitchOccur(false, gpu_preference_)) {
       host_->ForciblyCloseChannel();
+      TRACE_EVENT0(
+          "gpu",
+          "WebGfxCtx3DCmdBfrImpl::~WebGfxCtx3DCmdBfrImpl closed channel");
       ClearSharedContexts();
     }
   }
 
   {
     base::AutoLock lock(g_all_shared_contexts_lock.Get());
     g_all_shared_contexts.Pointer()->erase(this);
   }
   Destroy();
 }
@@ skipping 32 matching lines @@
     if (!host_)
       return false;
     DCHECK(host_->state() == GpuChannelHost::kConnected);
 
     if (!retry) {
       // If the creation of this context requires all contexts for this
       // client to be destroyed on the GPU process side, then drop the
       // channel and recreate it.
       if (host_->WillGpuSwitchOccur(true, gpu_preference_)) {
         host_->ForciblyCloseChannel();
+        TRACE_EVENT0(
+            "gpu",
+            "WebGfxCtx3DCmdBfrImpl::Initialize closed channel");
         ClearSharedContexts();
         retry = true;
       }
     } else {
       retry = false;
     }
   } while (retry);
 
   return true;
 }
@@ skipping 1302 matching lines @@
 
 }  // anonymous namespace
 
 void WebGraphicsContext3DCommandBufferImpl::OnContextLost() {
   context_lost_reason_ = convertReason(
       command_buffer_->GetLastState().context_lost_reason);
   if (context_lost_callback_) {
     context_lost_callback_->onContextLost();
   }
   if (attributes_.shareResources)
-    ClearSharedContexts();
+    ClearSharedContextsIfInShareSet(this);
   if (ShouldUseSwapClient())
     swap_client_->OnViewContextSwapBuffersAborted();
 }
 
 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage(
     const std::string& message, int id) {
   if (error_message_callback_) {
     WebKit::WebString str = WebKit::WebString::fromUTF8(message.c_str());
     error_message_callback_->onErrorMessage(str, id);
   }
 }