Revert of content: Cleanup GpuMemoryBuffers when child process is removed.

content/child/child_gpu_memory_buffer_manager.cc

 // Copyright 2014 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/child/child_gpu_memory_buffer_manager.h"
 
 #include "content/child/child_thread.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/gpu/client/gpu_memory_buffer_impl.h"
 
 namespace content {
 namespace {
 
 void DeletedGpuMemoryBuffer(ThreadSafeSender* sender,
+                            gfx::GpuMemoryBufferType type,
                             gfx::GpuMemoryBufferId id,
                             uint32 sync_point) {
   TRACE_EVENT0("renderer",
                "ChildGpuMemoryBufferManager::DeletedGpuMemoryBuffer");
-  sender->Send(new ChildProcessHostMsg_DeletedGpuMemoryBuffer(id, sync_point));
+  sender->Send(
+      new ChildProcessHostMsg_DeletedGpuMemoryBuffer(type, id, sync_point));
 }
 
 }  // namespace
 
 ChildGpuMemoryBufferManager::ChildGpuMemoryBufferManager(
     ThreadSafeSender* sender)
     : sender_(sender) {
 }
 
 ChildGpuMemoryBufferManager::~ChildGpuMemoryBufferManager() {
@@ skipping 15 matching lines @@
   IPC::Message* message = new ChildProcessHostMsg_SyncAllocateGpuMemoryBuffer(
       size.width(), size.height(), format, usage, &handle);
   bool success = sender_->Send(message);
   if (!success)
     return scoped_ptr<gfx::GpuMemoryBuffer>();
 
   scoped_ptr<GpuMemoryBufferImpl> buffer(GpuMemoryBufferImpl::CreateFromHandle(
       handle,
       size,
       format,
-      base::Bind(&DeletedGpuMemoryBuffer, sender_, handle.id)));
+      base::Bind(&DeletedGpuMemoryBuffer, sender_, handle.type, handle.id)));
   if (!buffer) {
-    sender_->Send(new ChildProcessHostMsg_DeletedGpuMemoryBuffer(handle.id, 0));
+    sender_->Send(new ChildProcessHostMsg_DeletedGpuMemoryBuffer(
+        handle.type, handle.id, 0));
     return scoped_ptr<gfx::GpuMemoryBuffer>();
   }
 
   return buffer.Pass();
 }
 
 gfx::GpuMemoryBuffer*
 ChildGpuMemoryBufferManager::GpuMemoryBufferFromClientBuffer(
     ClientBuffer buffer) {
   return GpuMemoryBufferImpl::FromClientBuffer(buffer);
 }
 
 void ChildGpuMemoryBufferManager::SetDestructionSyncPoint(
     gfx::GpuMemoryBuffer* buffer,
     uint32 sync_point) {
   static_cast<GpuMemoryBufferImpl*>(buffer)
       ->set_destruction_sync_point(sync_point);
 }
 
 }  // namespace content