| Index: content/common/gpu/gpu_memory_buffer_factory_win.cc
|
| diff --git a/content/common/gpu/gpu_memory_buffer_factory_win.cc b/content/common/gpu/gpu_memory_buffer_factory_win.cc
|
| index 97998ec0e21a30ea59e21cc24cfb361e5f9e637e..fde3e2aae19d227289130cf344ec817723681c88 100644
|
| --- a/content/common/gpu/gpu_memory_buffer_factory_win.cc
|
| +++ b/content/common/gpu/gpu_memory_buffer_factory_win.cc
|
| @@ -17,8 +17,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 {
|
| NOTREACHED();
|
| return gfx::GpuMemoryBufferHandle();
|
| }
|
| @@ -29,13 +29,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;
|
|
|