Index: content/common/gpu/gpu_memory_buffer_factory_x11.cc |
diff --git a/content/common/gpu/gpu_memory_buffer_factory_x11.cc b/content/common/gpu/gpu_memory_buffer_factory_x11.cc |
index 588b93569603e269a322b36b8818c017919afdc1..2131eb161dc0451e8a0bf998aec70416d91d940f 100644 |
--- a/content/common/gpu/gpu_memory_buffer_factory_x11.cc |
+++ b/content/common/gpu/gpu_memory_buffer_factory_x11.cc |
@@ -18,8 +18,8 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory { |
virtual gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer( |
const gfx::GpuMemoryBufferHandle& handle, |
const gfx::Size& size, |
- unsigned internalformat, |
- unsigned usage) override { |
+ gfx::GpuMemoryBuffer::Format format, |
+ gfx::GpuMemoryBuffer::Usage usage) override { |
switch (handle.type) { |
case gfx::X11_PIXMAP_BUFFER: |
x11_pixmap_factory_.CreateGpuMemoryBuffer(handle.global_id, |
@@ -44,13 +44,14 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory { |
virtual scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer( |
const gfx::GpuMemoryBufferHandle& handle, |
const gfx::Size& size, |
+ gfx::GpuMemoryBuffer::Format format, |
unsigned internalformat, |
int client_id) override { |
switch (handle.type) { |
case gfx::SHARED_MEMORY_BUFFER: { |
scoped_refptr<gfx::GLImageSharedMemory> image( |
new gfx::GLImageSharedMemory(size, internalformat)); |
- if (!image->Initialize(handle)) |
+ if (!image->Initialize(handle, format)) |
return NULL; |
return image; |