Index: ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h |
diff --git a/ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h b/ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h |
index 006a4a5497ac72a7242ce4506e0ceee8de39bd3b..00d8a4e49032056215b4b836cc1adb792026a78d 100644 |
--- a/ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h |
+++ b/ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h |
@@ -42,17 +42,19 @@ class OZONE_GPU_EXPORT GpuMemoryBufferFactoryOzoneNativeBuffer { |
void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id, int client_id); |
// Creates a GLImage instance for GPU memory buffer identified by |id|. |
- scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer( |
- gfx::GpuMemoryBufferId id, |
+ scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffers( |
reveman
2015/03/12 19:37:23
Same here. You can save this for a follow up patch
emircan
2015/03/12 22:34:27
Reverted.
|
+ int num_buffers, |
+ const std::vector<gfx::GpuMemoryBufferId>& ids, |
const gfx::Size& size, |
- gfx::GpuMemoryBuffer::Format format, |
+ const std::vector<gfx::GpuMemoryBuffer::Format>& formats, |
unsigned internalformat, |
int client_id); |
- static scoped_refptr<gfx::GLImage> CreateImageForPixmap( |
- scoped_refptr<NativePixmap> pixmap, |
+ static scoped_refptr<gfx::GLImage> CreateImageForPixmaps( |
+ int num_buffers, |
+ const std::vector<scoped_refptr<NativePixmap>>& pixmaps, |
const gfx::Size& size, |
- gfx::GpuMemoryBuffer::Format format, |
+ const std::vector<gfx::GpuMemoryBuffer::Format>& formats, |
unsigned internalformat); |
private: |