| Index: content/browser/gpu/browser_gpu_memory_buffer_manager.h
|
| diff --git a/content/browser/gpu/browser_gpu_memory_buffer_manager.h b/content/browser/gpu/browser_gpu_memory_buffer_manager.h
|
| index f3f4fa33890b833b07a2d20966ba3988cc8e0510..75db1395847653d1fa3f661ab8ed0bc0cb6bdfbd 100644
|
| --- a/content/browser/gpu/browser_gpu_memory_buffer_manager.h
|
| +++ b/content/browser/gpu/browser_gpu_memory_buffer_manager.h
|
| @@ -73,6 +73,9 @@ class CONTENT_EXPORT BrowserGpuMemoryBufferManager
|
| const gfx::GpuMemoryBufferHandle& handle,
|
| const gfx::Size& size,
|
| gfx::BufferFormat format) override;
|
| + std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBufferFromClientId(
|
| + int client_id,
|
| + const gfx::GpuMemoryBufferId& gpu_memory_buffer_id) override;
|
| gfx::GpuMemoryBuffer* GpuMemoryBufferFromClientBuffer(
|
| ClientBuffer buffer) override;
|
| void SetDestructionSyncToken(gfx::GpuMemoryBuffer* buffer,
|
| @@ -102,31 +105,25 @@ class CONTENT_EXPORT BrowserGpuMemoryBufferManager
|
|
|
| private:
|
| struct BufferInfo {
|
| - BufferInfo()
|
| - : type(gfx::EMPTY_BUFFER),
|
| - format(gfx::BufferFormat::RGBA_8888),
|
| - usage(gfx::BufferUsage::GPU_READ),
|
| - gpu_host_id(0) {}
|
| + BufferInfo();
|
| BufferInfo(const gfx::Size& size,
|
| gfx::GpuMemoryBufferType type,
|
| gfx::BufferFormat format,
|
| gfx::BufferUsage usage,
|
| - int gpu_host_id)
|
| - : size(size),
|
| - type(type),
|
| - format(format),
|
| - usage(usage),
|
| - gpu_host_id(gpu_host_id) {}
|
| + int gpu_host_id);
|
| + BufferInfo(const BufferInfo& other);
|
| + ~BufferInfo();
|
|
|
| gfx::Size size;
|
| - gfx::GpuMemoryBufferType type;
|
| - gfx::BufferFormat format;
|
| - gfx::BufferUsage usage;
|
| - int gpu_host_id;
|
| + gfx::GpuMemoryBufferType type = gfx::EMPTY_BUFFER;
|
| + gfx::BufferFormat format = gfx::BufferFormat::RGBA_8888;
|
| + gfx::BufferUsage usage = gfx::BufferUsage::GPU_READ;
|
| + int gpu_host_id = 0;
|
| };
|
|
|
| struct CreateGpuMemoryBufferRequest;
|
| struct CreateGpuMemoryBufferFromHandleRequest;
|
| + struct CreateGpuMemoryBufferFromClientIdRequest;
|
|
|
| using CreateDelegate = base::Callback<void(GpuProcessHost* host,
|
| gfx::GpuMemoryBufferId id,
|
| @@ -146,6 +143,8 @@ class CONTENT_EXPORT BrowserGpuMemoryBufferManager
|
| void HandleCreateGpuMemoryBufferOnIO(CreateGpuMemoryBufferRequest* request);
|
| void HandleCreateGpuMemoryBufferFromHandleOnIO(
|
| CreateGpuMemoryBufferFromHandleRequest* request);
|
| + void HandleCreateGpuMemoryBufferFromClientIdOnIO(
|
| + CreateGpuMemoryBufferFromClientIdRequest* request);
|
| void HandleGpuMemoryBufferCreatedOnIO(
|
| CreateGpuMemoryBufferRequest* request,
|
| const gfx::GpuMemoryBufferHandle& handle);
|
|
|