Use 3D graphics context shareResources flag to decide whether a context should share resources.

webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc

 // Copyright (c) 2011 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.
 
 #if defined(ENABLE_GPU)
 
 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 #include <GLES2/gl2.h>
 #ifndef GL_GLEXT_PROTOTYPES
@@ skipping 195 matching lines @@
 };
 
 namespace {
 
 const int32 kCommandBufferSize = 1024 * 1024;
 // TODO(kbr): make the transfer buffer size configurable via context
 // creation attributes.
 const int32 kTransferBufferSize = 1024 * 1024;
 
 static base::LazyInstance<
-    std::set<WebGraphicsContext3DInProcessCommandBufferImpl*> > g_all_contexts(
-        base::LINKER_INITIALIZED);
+    std::set<WebGraphicsContext3DInProcessCommandBufferImpl*> >
+        g_all_shared_contexts(base::LINKER_INITIALIZED);
 
 // Singleton used to initialize and terminate the gles2 library.
 class GLES2Initializer {
  public:
   GLES2Initializer() {
     gles2::Initialize();
   }
 
   ~GLES2Initializer() {
     gles2::Terminate();
@@ skipping 374 matching lines @@
 #endif  // defined(OS_MACOSX)
       context_lost_callback_(0),
       context_lost_reason_(GL_NO_ERROR),
       cached_width_(0),
       cached_height_(0),
       bound_fbo_(0) {
 }
 
 WebGraphicsContext3DInProcessCommandBufferImpl::
     ~WebGraphicsContext3DInProcessCommandBufferImpl() {
-  g_all_contexts.Pointer()->erase(this);
+  g_all_shared_contexts.Pointer()->erase(this);
 }
 
 // This string should only be passed for WebGL contexts. Nothing ELSE!!!
 // Compositor contexts, Canvas2D contexts, Pepper Contexts, nor any other use of
 // a context should not pass this string.
 static const char* kWebGLPreferredGLExtensions =
     "GL_OES_packed_depth_stencil "
     "GL_OES_depth24 "
     "GL_CHROMIUM_webglsl";
 
@@ skipping 31 matching lines @@
     WebKit::WebGraphicsContext3D* view_context =
         web_view ? web_view->graphicsContext3D() : NULL;
     if (view_context) {
       WebGraphicsContext3DInProcessCommandBufferImpl* context_impl =
           static_cast<WebGraphicsContext3DInProcessCommandBufferImpl*>(
               view_context);
       parent_context = context_impl->context_;
     }
   }
 
-  // HACK: Assume this is a WebGL context by looking for the noExtensions
-  // attribute. WebGL contexts must not go in the share group because they
-  // rely on destruction of the context to clean up owned resources. Putting
-  // them in a share group would prevent this from happening.
   WebGraphicsContext3DInProcessCommandBufferImpl* context_group = NULL;
-  if (!attributes.noExtensions)
-    context_group = g_all_contexts.Pointer()->empty() ?
-        NULL : *g_all_contexts.Pointer()->begin();
+  if (attributes.shareResources)
+    context_group = g_all_shared_contexts.Pointer()->empty() ?
+        NULL : *g_all_shared_contexts.Pointer()->begin();
 
   context_ = GLInProcessContext::CreateOffscreenContext(
       parent_context,
       gfx::Size(1, 1),
       context_group ? context_group->context_ : NULL,
       preferred_extensions,
       attribs,
       active_url);
   web_view_ = NULL;
 
@@ skipping 17 matching lines @@
     attributes_.depth = depth_bits > 0;
     GLint stencil_bits = 0;
     getIntegerv(GL_STENCIL_BITS, &stencil_bits);
     attributes_.stencil = stencil_bits > 0;
     GLint samples = 0;
     getIntegerv(GL_SAMPLES, &samples);
     attributes_.antialias = samples > 0;
   }
   makeContextCurrent();
 
-  if (!attributes.noExtensions)
-    g_all_contexts.Pointer()->insert(this);
+  if (attributes.shareResources)
+    g_all_shared_contexts.Pointer()->insert(this);
 
   return true;
 }
 
 bool WebGraphicsContext3DInProcessCommandBufferImpl::makeContextCurrent() {
   return GLInProcessContext::MakeCurrent(context_);
 }
 
 void WebGraphicsContext3DInProcessCommandBufferImpl::ClearContext() {
   // NOTE: Comment in the line below to check for code that is not calling
@@ skipping 911 matching lines @@
   if (context_lost_callback_) {
     context_lost_callback_->onContextLost();
   }
 }
 
 }  // namespace gpu
 }  // namespace webkit
 
 #endif  // defined(ENABLE_GPU)