Fix leak in GpuChannel

content/common/gpu/gpu_channel_manager.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/gpu_channel_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_memory_manager.h"
@@ skipping 80 matching lines @@
 
 void GpuChannelManager::RemoveRoute(int32 routing_id) {
   router_->RemoveRoute(routing_id);
 }
 
 GpuChannel* GpuChannelManager::LookupChannel(int32 client_id) {
   GpuChannelMap::const_iterator iter = gpu_channels_.find(client_id);
   if (iter == gpu_channels_.end())
     return NULL;
   else
-    return iter->second.get();
+    return iter->second;
 }
 
 bool GpuChannelManager::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(GpuChannelManager, msg)
     IPC_MESSAGE_HANDLER(GpuMsg_EstablishChannel, OnEstablishChannel)
     IPC_MESSAGE_HANDLER(GpuMsg_CloseChannel, OnCloseChannel)
     IPC_MESSAGE_HANDLER(GpuMsg_CreateViewCommandBuffer,
                         OnCreateViewCommandBuffer)
     IPC_MESSAGE_HANDLER(GpuMsg_CreateImage, OnCreateImage)
@@ skipping 14 matching lines @@
   if (share_context) {
     if (!share_group_.get()) {
       share_group_ = new gfx::GLShareGroup;
       DCHECK(!mailbox_manager_.get());
       mailbox_manager_ = new gpu::gles2::MailboxManager;
     }
     share_group = share_group_.get();
     mailbox_manager = mailbox_manager_.get();
   }
 
-  scoped_refptr<GpuChannel> channel = new GpuChannel(this,
-                                                     watchdog_,
-                                                     share_group,
-                                                     mailbox_manager,
-                                                     client_id,
-                                                     false);
+  scoped_ptr<GpuChannel> channel(new GpuChannel(
+      this, watchdog_, share_group, mailbox_manager, client_id, false));
   channel->Init(io_message_loop_.get(), shutdown_event_);
-  gpu_channels_[client_id] = channel;
   channel_handle.name = channel->GetChannelName();
 
 #if defined(OS_POSIX)
   // On POSIX, pass the renderer-side FD. Also mark it as auto-close so
   // that it gets closed after it has been sent.
   int renderer_fd = channel->TakeRendererFileDescriptor();
   DCHECK_NE(-1, renderer_fd);
   channel_handle.socket = base::FileDescriptor(renderer_fd, true);
 #endif
 
+  gpu_channels_.set(client_id, channel.Pass());
+
   Send(new GpuHostMsg_ChannelEstablished(channel_handle));
 }
 
 void GpuChannelManager::OnCloseChannel(
     const IPC::ChannelHandle& channel_handle) {
   for (GpuChannelMap::iterator iter = gpu_channels_.begin();
        iter != gpu_channels_.end(); ++iter) {
     if (iter->second->GetChannelName() == channel_handle.name) {
       gpu_channels_.erase(iter);
       return;
@@ skipping 135 matching lines @@
 
 gfx::GLSurface* GpuChannelManager::GetDefaultOffscreenSurface() {
   if (!default_offscreen_surface_.get()) {
     default_offscreen_surface_ =
         gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(1, 1));
   }
   return default_offscreen_surface_.get();
 }
 
 }  // namespace content