Fix crash caused by concurrent access to framebuffer_combo_complete_map_.

gpu/command_buffer/service/context_group.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 "gpu/command_buffer/service/context_group.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 12 matching lines @@
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_version_info.h"
 
 namespace gpu {
 namespace gles2 {
 
 ContextGroup::ContextGroup(
     const scoped_refptr<MailboxManager>& mailbox_manager,
     const scoped_refptr<MemoryTracker>& memory_tracker,
     const scoped_refptr<ShaderTranslatorCache>& shader_translator_cache,
+    const scoped_refptr<FramebufferCompletenessCache>&
+        framebuffer_completeness_cache,
     const scoped_refptr<FeatureInfo>& feature_info,
     const scoped_refptr<SubscriptionRefSet>& subscription_ref_set,
     const scoped_refptr<ValueStateMap>& pending_valuebuffer_state,
     bool bind_generates_resource)
     : context_type_(CONTEXT_TYPE_UNDEFINED),
       mailbox_manager_(mailbox_manager),
       memory_tracker_(memory_tracker),
       shader_translator_cache_(shader_translator_cache),
+#if defined(OS_MACOSX)
+      // Framebuffer completeness is not cacheable on OS X because of dynamic
+      // graphics switching.
+      // http://crbug.com/180876
+      // TODO(tobiasjs): determine whether GPU switching is possible
+      // programmatically, rather than just hardcoding this behaviour
+      // for OS X.
+      framebuffer_completeness_cache_(NULL),
+#else
+      framebuffer_completeness_cache_(framebuffer_completeness_cache),
+#endif
       subscription_ref_set_(subscription_ref_set),
       pending_valuebuffer_state_(pending_valuebuffer_state),
       enforce_gl_minimums_(
           base::CommandLine::InitializedForCurrentProcess()
               ? base::CommandLine::ForCurrentProcess()->HasSwitch(
                     switches::kEnforceGLMinimums)
               : false),
       bind_generates_resource_(bind_generates_resource),
       max_vertex_attribs_(0u),
       max_texture_units_(0u),
@@ skipping 96 matching lines @@
     GetIntegerv(GL_MAX_COLOR_ATTACHMENTS_EXT, &max_color_attachments_);
     if (max_color_attachments_ < 1)
       max_color_attachments_ = 1;
     GetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &max_draw_buffers_);
     if (max_draw_buffers_ < 1)
       max_draw_buffers_ = 1;
   }
 
   buffer_manager_.reset(
       new BufferManager(memory_tracker_.get(), feature_info_.get()));
-  framebuffer_manager_.reset(new FramebufferManager(
-      max_draw_buffers_, max_color_attachments_, context_type));
+  framebuffer_manager_.reset(
+      new FramebufferManager(max_draw_buffers_, max_color_attachments_,
+                             context_type, framebuffer_completeness_cache_));
   renderbuffer_manager_.reset(new RenderbufferManager(
       memory_tracker_.get(), max_renderbuffer_size, max_samples,
       feature_info_.get()));
   shader_manager_.reset(new ShaderManager());
   valuebuffer_manager_.reset(
       new ValuebufferManager(subscription_ref_set_.get(),
                              pending_valuebuffer_state_.get()));
 
   // Lookup GL things we need to know.
   const GLint kGLES2RequiredMinimumVertexAttribs = 8u;
@@ skipping 283 matching lines @@
     GLuint client_id, GLuint* service_id) const {
   Buffer* buffer = buffer_manager_->GetBuffer(client_id);
   if (!buffer)
     return false;
   *service_id = buffer->service_id();
   return true;
 }
 
 }  // namespace gles2
 }  // namespace gpu