| Index: cc/test/test_gpu_memory_buffer_manager.cc
|
| diff --git a/cc/test/test_gpu_memory_buffer_manager.cc b/cc/test/test_gpu_memory_buffer_manager.cc
|
| index fb6899f81d137319173a35267fee37888a78ae2a..47c2fae9f9feea8771659de0d4f4e5b2b89f1ca0 100644
|
| --- a/cc/test/test_gpu_memory_buffer_manager.cc
|
| +++ b/cc/test/test_gpu_memory_buffer_manager.cc
|
| @@ -129,7 +129,10 @@ TestGpuMemoryBufferManager::TestGpuMemoryBufferManager() {
|
| }
|
|
|
| TestGpuMemoryBufferManager::~TestGpuMemoryBufferManager() {
|
| - DCHECK(buffers_.empty());
|
| + {
|
| + base::AutoLock hold(buffers_lock_);
|
| + DCHECK(buffers_.empty());
|
| + }
|
| DCHECK(clients_.empty());
|
| if (parent_gpu_memory_buffer_manager_)
|
| parent_gpu_memory_buffer_manager_->clients_.erase(client_id_);
|
| @@ -148,6 +151,7 @@ TestGpuMemoryBufferManager::CreateClientGpuMemoryBufferManager() {
|
|
|
| void TestGpuMemoryBufferManager::OnGpuMemoryBufferDestroyed(
|
| gfx::GpuMemoryBufferId gpu_memory_buffer_id) {
|
| + base::AutoLock hold(buffers_lock_);
|
| DCHECK(buffers_.find(gpu_memory_buffer_id.id) != buffers_.end());
|
| buffers_.erase(gpu_memory_buffer_id.id);
|
| }
|
| @@ -168,6 +172,7 @@ TestGpuMemoryBufferManager::CreateGpuMemoryBuffer(
|
| this, last_gpu_memory_buffer_id_, size, format, std::move(shared_memory),
|
| 0, base::checked_cast<int>(
|
| gfx::RowSizeForBufferFormat(size.width(), format, 0))));
|
| + base::AutoLock hold(buffers_lock_);
|
| buffers_[last_gpu_memory_buffer_id_] = result.get();
|
| return result;
|
| }
|
|
|