Ensure that a ContextGroup is not destroyed if it was not correctly initialized.

The counting of contexts in the group was out of sync, causing an assertion in release builds.

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

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

1 files changed, 6 insertions, 2 deletions

diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index c3402d9..0dab855 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -1765,6 +1765,7 @@ bool GLES2DecoderImpl::Initialize(
   if (!MakeCurrent()) {
     LOG(ERROR) << "GLES2DecoderImpl::Initialize failed because "
                << "MakeCurrent failed.";
+    group_ = NULL;  // Must not destroy ContextGroup if it is not initialized.
     Destroy();
     return false;
   }
@@ -1772,6 +1773,7 @@ bool GLES2DecoderImpl::Initialize(
   if (!group_->Initialize(disallowed_features, allowed_extensions)) {
     LOG(ERROR) << "GpuScheduler::InitializeCommon failed because group "
                << "failed to initialize.";
+    group_ = NULL;  // Must not destroy ContextGroup if it is not initialized.
     Destroy();
     return false;
   }
@@ -2414,8 +2416,10 @@ void GLES2DecoderImpl::Destroy() {
       offscreen_resolved_color_texture_->Invalidate();
   }
 
-  group_->Destroy(have_context);
-  group_ = NULL;
+  if (group_) {
+    group_->Destroy(have_context);
+    group_ = NULL;
+  }
 
   if (context_.get()) {
     context_->ReleaseCurrent(NULL);