| Index: components/viz/common/server_gpu_memory_buffer_manager.cc
|
| diff --git a/components/viz/common/server_gpu_memory_buffer_manager.cc b/components/viz/common/server_gpu_memory_buffer_manager.cc
|
| index 7690382b8dd4f98f237aa35b1025f30b11744d33..8b31b1158fb2a1d86093cc5fca2ed414ce898c08 100644
|
| --- a/components/viz/common/server_gpu_memory_buffer_manager.cc
|
| +++ b/components/viz/common/server_gpu_memory_buffer_manager.cc
|
| @@ -47,14 +47,18 @@ void ServerGpuMemoryBufferManager::AllocateGpuMemoryBuffer(
|
| }
|
| }
|
|
|
| - DCHECK(gpu::GpuMemoryBufferImplSharedMemory::IsUsageSupported(usage))
|
| - << static_cast<int>(usage);
|
| - task_runner_->PostTask(
|
| - FROM_HERE,
|
| - base::BindOnce(
|
| - std::move(callback),
|
| - gpu::GpuMemoryBufferImplSharedMemory::CreateGpuMemoryBuffer(id, size,
|
| - format)));
|
| + gfx::GpuMemoryBufferHandle buffer_handle;
|
| + // The requests are coming in from untrusted clients. So verify that it is
|
| + // possible to allocate shared memory buffer first.
|
| + if (gpu::GpuMemoryBufferImplSharedMemory::IsUsageSupported(usage) &&
|
| + gpu::GpuMemoryBufferImplSharedMemory::IsSizeValidForFormat(size,
|
| + format)) {
|
| + buffer_handle = gpu::GpuMemoryBufferImplSharedMemory::CreateGpuMemoryBuffer(
|
| + id, size, format);
|
| + }
|
| +
|
| + task_runner_->PostTask(FROM_HERE,
|
| + base::BindOnce(std::move(callback), buffer_handle));
|
| }
|
|
|
| std::unique_ptr<gfx::GpuMemoryBuffer>
|
|
|