Fix crash caused by concurrent access to framebuffer_combo_complete_map_.

gpu/command_buffer/service/framebuffer_manager.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_FRAMEBUFFER_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_FRAMEBUFFER_MANAGER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 namespace gles2 {
 
+class FramebufferCompletenessCache;
 class FramebufferManager;
 class Renderbuffer;
 class RenderbufferManager;
 class Texture;
 class TextureRef;
 class TextureManager;
 
 // Info about a particular Framebuffer.
 class GPU_EXPORT Framebuffer : public base::RefCounted<Framebuffer> {
  public:
@@ skipping 118 matching lines @@
   // PrepareDrawBuffersForClear().
   void RestoreDrawBuffersAfterClear() const;
 
   // Return true if any draw buffers has an alpha channel.
   bool HasAlphaMRT() const;
 
   // Return false if any two active color attachments have different internal
   // formats.
   bool HasSameInternalFormatsMRT() const;
 
-  static void ClearFramebufferCompleteComboMap();
-
-  static bool AllowFramebufferComboCompleteMapForTesting() {
-    return allow_framebuffer_combo_complete_map_;
-  }
-
   void OnTextureRefDetached(TextureRef* texture);
   void OnWillRenderTo() const;
   void OnDidRenderTo() const;
 
   void set_read_buffer(GLenum read_buffer) {
     read_buffer_ = read_buffer;
   }
 
   GLenum read_buffer() const {
     return read_buffer_;
@@ skipping 35 matching lines @@
   // Whether this framebuffer has ever been bound.
   bool has_been_bound_;
 
   // state count when this framebuffer was last checked for completeness.
   unsigned framebuffer_complete_state_count_id_;
 
   // A map of attachments.
   typedef base::hash_map<GLenum, scoped_refptr<Attachment> > AttachmentMap;
   AttachmentMap attachments_;
 
-  // A map of successful frame buffer combos. If it's in the map
-  // it should be FRAMEBUFFER_COMPLETE.
-  typedef base::hash_map<std::string, bool> FramebufferComboCompleteMap;
-  static FramebufferComboCompleteMap* framebuffer_combo_complete_map_;
-  static bool allow_framebuffer_combo_complete_map_;
-
   scoped_ptr<GLenum[]> draw_buffers_;
 
   GLenum read_buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(Framebuffer);
 };
 
 struct DecoderFramebufferState {
   DecoderFramebufferState();
   ~DecoderFramebufferState();
@@ skipping 15 matching lines @@
    public:
     TextureDetachObserver();
     virtual ~TextureDetachObserver();
 
     virtual void OnTextureRefDetachedFromFramebuffer(TextureRef* texture) = 0;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(TextureDetachObserver);
   };
 
-  FramebufferManager(uint32 max_draw_buffers, uint32 max_color_attachments,
-                     ContextGroup::ContextType context_type);
+  FramebufferManager(uint32 max_draw_buffers,
+                     uint32 max_color_attachments,
+                     ContextGroup::ContextType context_type,
+                     const scoped_refptr<FramebufferCompletenessCache>&
+                         framebuffer_combo_complete_cache);
   ~FramebufferManager();
 
   // Must call before destruction.
   void Destroy(bool have_context);
 
   // Creates a Framebuffer for the given framebuffer.
   void CreateFramebuffer(GLuint client_id, GLuint service_id);
 
   // Gets the framebuffer info for the given framebuffer.
   Framebuffer* GetFramebuffer(GLuint client_id);
@@ skipping 28 matching lines @@
         std::remove(texture_detach_observers_.begin(),
                     texture_detach_observers_.end(),
                     observer),
         texture_detach_observers_.end());
   }
 
   ContextGroup::ContextType context_type() const {
     return context_type_;
   }
 
+  void SetFramebufferComboCompleteCacheForTesting(
+      const scoped_refptr<FramebufferCompletenessCache>&
+          framebuffer_combo_complete_cache) {
+    framebuffer_combo_complete_cache_ = framebuffer_combo_complete_cache;
+  }
+
  private:
   friend class Framebuffer;
 
   void StartTracking(Framebuffer* framebuffer);
   void StopTracking(Framebuffer* framebuffer);
 
   void OnTextureRefDetached(TextureRef* texture);
 
+  FramebufferCompletenessCache* GetFramebufferComboCompleteCache() {
+    return framebuffer_combo_complete_cache_.get();
+  }
+
   // Info for each framebuffer in the system.
   typedef base::hash_map<GLuint, scoped_refptr<Framebuffer> >
       FramebufferMap;
   FramebufferMap framebuffers_;
 
   // Incremented anytime anything changes that might effect framebuffer
   // state.
   unsigned framebuffer_state_change_count_;
 
   // Counts the number of Framebuffer allocated with 'this' as its manager.
   // Allows to check no Framebuffer will outlive this.
   unsigned int framebuffer_count_;
 
   bool have_context_;
 
   uint32 max_draw_buffers_;
   uint32 max_color_attachments_;
 
   ContextGroup::ContextType context_type_;
 
   typedef std::vector<TextureDetachObserver*> TextureDetachObserverVector;
   TextureDetachObserverVector texture_detach_observers_;
 
+  scoped_refptr<FramebufferCompletenessCache> framebuffer_combo_complete_cache_;
+
   DISALLOW_COPY_AND_ASSIGN(FramebufferManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_FRAMEBUFFER_MANAGER_H_