Ensure that ContextGroup is destroyed when an appropriate GL context is current.

Before it relied on the destructor being invoked and this was not always true. I think the subsequent invalid GL commands might have caused memory corruption that lead to the bug referenced below.

Now the ContextGroup is destroyed explicitly when the context is known to be correct.

BUG=97775
Review URL: http://codereview.chromium.org/8135014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104157 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 10 deletions

diff --git a/gpu/command_buffer/service/context_group.h b/gpu/command_buffer/service/context_group.h
index 1700423..48fac44 100644
--- a/gpu/command_buffer/service/context_group.h
+++ b/gpu/command_buffer/service/context_group.h
@@ -39,14 +39,14 @@ class ContextGroup : public base::RefCounted<ContextGroup> {
   explicit ContextGroup(bool bind_generates_resource);
   ~ContextGroup();
 
-  // This should only be called by GLES2Decoder.
+  // This should only be called by GLES2Decoder. This must be paired with a
+  // call to destroy if it succeeds.
   bool Initialize(const DisallowedFeatures& disallowed_features,
                   const char* allowed_features);
 
-  // Sets the ContextGroup has having a lost context.
-  void set_have_context(bool have_context) {
-    have_context_ = have_context;
-  }
+  // Destroys all the resources when called for the last context in the group.
+  // It should only be called by GLES2Decoder.
+  void Destroy(bool have_context);
 
   bool bind_generates_resource() {
     return bind_generates_resource_;
@@ -111,12 +111,8 @@ class ContextGroup : public base::RefCounted<ContextGroup> {
   IdAllocatorInterface* GetIdAllocator(unsigned namespace_id);
 
  private:
-  // Destroys all the resources.
-  void Destroy();
-
   // Whether or not this context is initialized.
-  bool initialized_;
-  bool have_context_;
+  int num_contexts_;
   bool bind_generates_resource_;
 
   uint32 max_vertex_attribs_;