Chromium Code Reviews| Index: content/browser/gpu/browser_gpu_memory_buffer_manager.cc |
| diff --git a/content/browser/gpu/browser_gpu_memory_buffer_manager.cc b/content/browser/gpu/browser_gpu_memory_buffer_manager.cc |
| index a3feef78a5431ad33345e7d82730095ddb55a044..e67eeb8743bc0ccb8048acc0f06cf5f8e42b018a 100644 |
| --- a/content/browser/gpu/browser_gpu_memory_buffer_manager.cc |
| +++ b/content/browser/gpu/browser_gpu_memory_buffer_manager.cc |
| @@ -110,10 +110,13 @@ BrowserGpuMemoryBufferManager::GpuMemoryBufferFromClientBuffer( |
| void BrowserGpuMemoryBufferManager::ChildProcessDeletedGpuMemoryBuffer( |
| gfx::GpuMemoryBufferType type, |
| const gfx::GpuMemoryBufferId& id, |
| - base::ProcessHandle child_process_handle) { |
| + base::ProcessHandle child_process_handle, |
| + int child_client_id, |
| + uint32 sync_point) { |
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| - GpuMemoryBufferImpl::DeletedByChildProcess(type, id, child_process_handle); |
| + GpuMemoryBufferImpl::DeletedByChildProcess(type, id, child_process_handle, |
| + child_client_id, sync_point); |
|
reveman
2014/11/03 22:26:12
nit: is this formatted correctly?
|
| } |
| void BrowserGpuMemoryBufferManager::ProcessRemoved( |
| @@ -143,4 +146,11 @@ void BrowserGpuMemoryBufferManager::GpuMemoryBufferCreatedOnIO( |
| request->event.Signal(); |
| } |
| +void BrowserGpuMemoryBufferManager::RecordDestructionSyncPoint( |
| + ClientBuffer buffer, |
| + uint32 sync_point) { |
| + GpuMemoryBufferImpl::FromClientBuffer(buffer) |
| + ->set_destruction_sync_point(sync_point); |
| +} |
| + |
| } // namespace content |