Index: content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc |
diff --git a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc |
index 6185150e5cf71764ea4ffcef46548084ae8253e3..7c82e5b5694a224d62cae0b6ed3f2bafa45e40b8 100644 |
--- a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc |
+++ b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc |
@@ -80,14 +80,20 @@ gpu::ImageFactory* GpuMemoryBufferFactoryOzoneNativeBuffer::AsImageFactory() { |
scoped_refptr<gfx::GLImage> |
GpuMemoryBufferFactoryOzoneNativeBuffer::CreateImageForGpuMemoryBuffer( |
- const gfx::GpuMemoryBufferHandle& handle, |
+ const std::vector<gfx::GpuMemoryBufferHandle>& handles, |
const gfx::Size& size, |
- gfx::GpuMemoryBuffer::Format format, |
+ const std::vector<gfx::GpuMemoryBuffer::Format>& formats, |
unsigned internalformat, |
int client_id) { |
- DCHECK_EQ(handle.type, gfx::OZONE_NATIVE_BUFFER); |
+ int num_buffers = handles.size(); |
+ std::vector<gfx::GpuMemoryBufferId> handle_ids(num_buffers); |
+ for (int i = 0; i < handles.size(); ++i) { |
+ DCHECK_EQ(handles[i].type, gfx::OZONE_NATIVE_BUFFER); |
+ handle_ids[i] = handles[i].id; |
+ } |
+ |
return ozone_native_buffer_factory_.CreateImageForGpuMemoryBuffer( |
- handle.id, size, format, internalformat, client_id); |
+ handle_ids, size, formats, internalformat, client_id); |
} |
} // namespace content |