Delete shared state transfer buffer upon command-buffer deletion.

content/common/gpu/client/command_buffer_proxy_impl.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/client/command_buffer_proxy_impl.h"
 
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/process_util.h"
@@ skipping 16 matching lines @@
 using gpu::Buffer;
 
 CommandBufferProxyImpl::CommandBufferProxyImpl(
     GpuChannelHost* channel,
     int route_id)
     : shared_state_(NULL),
       channel_(channel),
       route_id_(route_id),
       flush_count_(0),
       last_put_offset_(-1),
-      next_signal_id_(0) {
+      next_signal_id_(0),
+      state_buffer_(-1) {
 }
 
 CommandBufferProxyImpl::~CommandBufferProxyImpl() {
+  if (state_buffer_ != -1)
+    DestroyTransferBuffer(state_buffer_);
   // Delete all the locally cached shared memory objects, closing the handle
   // in this process.
   for (TransferBufferMap::iterator it = transfer_buffers_.begin();
        it != transfer_buffers_.end();
        ++it) {
     delete it->second.shared_memory;
     it->second.shared_memory = NULL;
   }
   for (Decoders::iterator it = video_decoder_hosts_.begin();
        it != video_decoder_hosts_.end(); ++it) {
@@ skipping 90 matching lines @@
   if (!Send(new GpuCommandBufferMsg_Initialize(route_id_, &result))) {
     LOG(ERROR) << "Could not send GpuCommandBufferMsg_Initialize.";
     return false;
   }
 
   if (!result) {
     LOG(ERROR) << "Failed to initialize command buffer service.";
     return false;
   }
 
-  int32 state_buffer = CreateTransferBuffer(sizeof *shared_state_, -1);
+  state_buffer_ = CreateTransferBuffer(sizeof *shared_state_, -1);
 
-  if (state_buffer == -1) {
+  if (state_buffer_ == -1) {
     LOG(ERROR) << "Failed to create shared state transfer buffer.";
     return false;
   }
 
-  gpu::Buffer buffer = GetTransferBuffer(state_buffer);
+  gpu::Buffer buffer = GetTransferBuffer(state_buffer_);
   if (!buffer.ptr) {
     LOG(ERROR) << "Failed to get shared state transfer buffer";
     return false;
   }
 
   shared_state_ = reinterpret_cast<gpu::CommandBufferSharedState*>(buffer.ptr);
   shared_state_->Initialize();
 
   if (!Send(new GpuCommandBufferMsg_SetSharedStateBuffer(route_id_,
-                                                         state_buffer))) {
+                                                         state_buffer_))) {
     LOG(ERROR) << "Failed to initialize shared command buffer state.";
     return false;
   }
 
   return true;
 }
 
 gpu::CommandBuffer::State CommandBufferProxyImpl::GetState() {
   // Send will flag state with lost context if IPC fails.
   if (last_state_.error == gpu::error::kNoError) {
@@ skipping 372 matching lines @@
 
 void CommandBufferProxyImpl::SetOnConsoleMessageCallback(
     const GpuConsoleMessageCallback& callback) {
   console_message_callback_ = callback;
 }
 
 void CommandBufferProxyImpl::TryUpdateState() {
   if (last_state_.error == gpu::error::kNoError)
     shared_state_->Read(&last_state_);
 }