OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" | 5 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/synchronization/waitable_event.h" | 10 #include "base/synchronization/waitable_event.h" |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 | 103 |
104 gfx::GpuMemoryBuffer* | 104 gfx::GpuMemoryBuffer* |
105 BrowserGpuMemoryBufferManager::GpuMemoryBufferFromClientBuffer( | 105 BrowserGpuMemoryBufferManager::GpuMemoryBufferFromClientBuffer( |
106 ClientBuffer buffer) { | 106 ClientBuffer buffer) { |
107 return GpuMemoryBufferImpl::FromClientBuffer(buffer); | 107 return GpuMemoryBufferImpl::FromClientBuffer(buffer); |
108 } | 108 } |
109 | 109 |
110 void BrowserGpuMemoryBufferManager::ChildProcessDeletedGpuMemoryBuffer( | 110 void BrowserGpuMemoryBufferManager::ChildProcessDeletedGpuMemoryBuffer( |
111 gfx::GpuMemoryBufferType type, | 111 gfx::GpuMemoryBufferType type, |
112 const gfx::GpuMemoryBufferId& id, | 112 const gfx::GpuMemoryBufferId& id, |
113 base::ProcessHandle child_process_handle) { | 113 base::ProcessHandle child_process_handle, |
| 114 uint32 sync_point) { |
114 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 115 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
115 | 116 |
116 GpuMemoryBufferImpl::DeletedByChildProcess(type, id, child_process_handle); | 117 GpuMemoryBufferImpl::DeletedByChildProcess(type, id, child_process_handle, |
| 118 sync_point); |
117 } | 119 } |
118 | 120 |
119 void BrowserGpuMemoryBufferManager::ProcessRemoved( | 121 void BrowserGpuMemoryBufferManager::ProcessRemoved( |
120 base::ProcessHandle process_handle) { | 122 base::ProcessHandle process_handle) { |
121 // TODO(reveman): Handle child process removal correctly. | 123 // TODO(reveman): Handle child process removal correctly. |
122 } | 124 } |
123 | 125 |
124 // static | 126 // static |
125 void BrowserGpuMemoryBufferManager::AllocateGpuMemoryBufferOnIO( | 127 void BrowserGpuMemoryBufferManager::AllocateGpuMemoryBufferOnIO( |
126 AllocateGpuMemoryBufferRequest* request) { | 128 AllocateGpuMemoryBufferRequest* request) { |
127 GpuMemoryBufferImpl::Create( | 129 GpuMemoryBufferImpl::Create( |
128 request->size, | 130 request->size, |
129 request->format, | 131 request->format, |
130 request->usage, | 132 request->usage, |
131 request->client_id, | 133 request->client_id, |
132 base::Bind(&BrowserGpuMemoryBufferManager::GpuMemoryBufferCreatedOnIO, | 134 base::Bind(&BrowserGpuMemoryBufferManager::GpuMemoryBufferCreatedOnIO, |
133 base::Unretained(request))); | 135 base::Unretained(request))); |
134 } | 136 } |
135 | 137 |
136 // static | 138 // static |
137 void BrowserGpuMemoryBufferManager::GpuMemoryBufferCreatedOnIO( | 139 void BrowserGpuMemoryBufferManager::GpuMemoryBufferCreatedOnIO( |
138 AllocateGpuMemoryBufferRequest* request, | 140 AllocateGpuMemoryBufferRequest* request, |
139 scoped_ptr<GpuMemoryBufferImpl> buffer) { | 141 scoped_ptr<GpuMemoryBufferImpl> buffer) { |
140 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 142 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
141 | 143 |
142 request->result = buffer.Pass(); | 144 request->result = buffer.Pass(); |
143 request->event.Signal(); | 145 request->event.Signal(); |
144 } | 146 } |
145 | 147 |
| 148 void BrowserGpuMemoryBufferManager::RecordDestructionSyncPoint( |
| 149 ClientBuffer buffer, |
| 150 uint32 sync_point) { |
| 151 GpuMemoryBufferImpl::FromClientBuffer(buffer) |
| 152 ->set_destruction_sync_point(sync_point); |
| 153 } |
| 154 |
146 } // namespace content | 155 } // namespace content |
OLD | NEW |