diff options
| author | yhirano <yhirano@chromium.org> | 2014-11-06 00:25:52 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-06 08:26:10 +0000 |
| commit | d1f3f55d090788dcb09321e6425fc953ac40ee0a (patch) | |
| tree | b8becaad82de8ce4a8d9a5a37a2fd6a24107a710 /content/browser/gpu/browser_gpu_memory_buffer_manager.h | |
| parent | 2e581f19c03b70c817614068c5bb1dbf9ba86af7 (diff) | |
| download | chromium_src-d1f3f55d090788dcb09321e6425fc953ac40ee0a.zip chromium_src-d1f3f55d090788dcb09321e6425fc953ac40ee0a.tar.gz chromium_src-d1f3f55d090788dcb09321e6425fc953ac40ee0a.tar.bz2 | |
Revert of content: Cleanup GpuMemoryBuffers when child process is removed. (patchset #5 id:80001 of https://codereview.chromium.org/703463005/)
Reason for revert:
Blink layout tests are failing and this CL might be the cause. Let me revert this CL.
Original issue's description:
> content: Cleanup GpuMemoryBuffers when child process is removed.
>
> This keeps track of buffers allocated for child processes in
> BrowserGpuMemoryBufferManager and makes sure
> GpuMemoryBufferImpl::DeletedByChildProcess is called
> appropriately when a process is removed.
>
> BUG=
>
> Committed: https://crrev.com/32e22ea8b72f52ac89e5d5720d1a26596f015caf
> Cr-Commit-Position: refs/heads/master@{#302968}
TBR=piman@chromium.org,alexst@chromium.org,kenrb@chromium.org,reveman@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=
Review URL: https://codereview.chromium.org/709433002
Cr-Commit-Position: refs/heads/master@{#302984}
Diffstat (limited to 'content/browser/gpu/browser_gpu_memory_buffer_manager.h')
| -rw-r--r-- | content/browser/gpu/browser_gpu_memory_buffer_manager.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/content/browser/gpu/browser_gpu_memory_buffer_manager.h b/content/browser/gpu/browser_gpu_memory_buffer_manager.h index 84ad9e5..b5ea1482 100644 --- a/content/browser/gpu/browser_gpu_memory_buffer_manager.h +++ b/content/browser/gpu/browser_gpu_memory_buffer_manager.h @@ -41,21 +41,16 @@ class CONTENT_EXPORT BrowserGpuMemoryBufferManager int child_client_id, const AllocationCallback& callback); void ChildProcessDeletedGpuMemoryBuffer( + gfx::GpuMemoryBufferType type, gfx::GpuMemoryBufferId id, base::ProcessHandle child_process_handle, int child_client_id, uint32 sync_point); - void ProcessRemoved(base::ProcessHandle process_handle, int client_id); + void ProcessRemoved(base::ProcessHandle process_handle); private: struct AllocateGpuMemoryBufferRequest; - void GpuMemoryBufferAllocatedForChildProcess( - base::ProcessHandle child_process_handle, - int child_client_id, - const AllocationCallback& callback, - const gfx::GpuMemoryBufferHandle& handle); - static void AllocateGpuMemoryBufferOnIO( AllocateGpuMemoryBufferRequest* request); static void GpuMemoryBufferCreatedOnIO( @@ -63,13 +58,6 @@ class CONTENT_EXPORT BrowserGpuMemoryBufferManager scoped_ptr<GpuMemoryBufferImpl> buffer); int gpu_client_id_; - - typedef base::hash_map<gfx::GpuMemoryBufferId, gfx::GpuMemoryBufferType> - BufferMap; - typedef base::hash_map<int, BufferMap> ClientMap; - ClientMap clients_; - - DISALLOW_COPY_AND_ASSIGN(BrowserGpuMemoryBufferManager); }; } // namespace content |