Delay GpuCommandBufferStub::AddDestructionObserver until we need it.

content/common/gpu/texture_image_transport_surface.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 "content/common/gpu/texture_image_transport_surface.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 29 matching lines @@
         backbuffer_suggested_allocation_(true),
         frontbuffer_suggested_allocation_(true),
         frontbuffer_is_protected_(true),
         protection_state_id_(0),
         handle_(handle),
         parent_stub_(NULL) {
   helper_.reset(new ImageTransportHelper(this,
                                          manager,
                                          stub,
                                          gfx::kNullPluginWindow));
-
-  stub->AddDestructionObserver(this);
 }
 
 TextureImageTransportSurface::~TextureImageTransportSurface() {
   DCHECK(stub_destroyed_);
   Destroy();
 }
 
 bool TextureImageTransportSurface::Initialize() {
   GpuChannelManager* manager = helper_->manager();
   GpuChannel* parent_channel = manager->LookupChannel(handle_.parent_client_id);
@@ skipping 65 matching lines @@
 
   if (!fbo_id_) {
     glGenFramebuffersEXT(1, &fbo_id_);
     glBindFramebufferEXT(GL_FRAMEBUFFER, fbo_id_);
     CreateBackTexture(gfx::Size(1, 1));
 
 #ifndef NDEBUG
     GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER);
     if (status != GL_FRAMEBUFFER_COMPLETE) {
       DLOG(ERROR) << "Framebuffer incomplete.";
+      glDeleteFramebuffersEXT(1, &fbo_id_);
+      fbo_id_ = 0;
       return false;
     }
 #endif
+    DCHECK(helper_->stub());
+    helper_->stub()->AddDestructionObserver(this);
   }
 
   return true;
 }
 
 unsigned int TextureImageTransportSurface::GetBackingFrameBufferObject() {
   return fbo_id_;
 }
 
 void TextureImageTransportSurface::SetBackbufferAllocation(bool allocation) {
@@ skipping 51 matching lines @@
 void TextureImageTransportSurface::OnResize(gfx::Size size) {
   CreateBackTexture(size);
 }
 
 void TextureImageTransportSurface::OnWillDestroyStub(
     GpuCommandBufferStub* stub) {
   if (stub == parent_stub_) {
     ReleaseParentStub();
     helper_->SetPreemptByCounter(NULL);
   } else {
+    DCHECK(stub == helper_->stub());
     stub->RemoveDestructionObserver(this);
 
     // We are losing the stub owning us, this is our last chance to clean up the
     // resources we allocated in the stub's context.
     if (fbo_id_) {
       glDeleteFramebuffersEXT(1, &fbo_id_);
       CHECK_GL_ERROR();
       fbo_id_ = 0;
     }
 
@@ skipping 282 matching lines @@
     Texture& texture = textures_[i];
     texture.info = NULL;
     if (!texture.sent_to_client)
       continue;
     GpuHostMsg_AcceleratedSurfaceRelease_Params params;
     params.identifier = texture.client_id;
     helper_->SendAcceleratedSurfaceRelease(params);
   }
   parent_stub_ = NULL;
 }