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..8c79e65f2e1944b7af3c39b4869e6a1a6d401911 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 |
@@ -12,8 +12,11 @@ namespace content { |
namespace { |
const GpuMemoryBufferFactory::Configuration kSupportedConfigurations[] = { |
- { gfx::GpuMemoryBuffer::RGBA_8888, gfx::GpuMemoryBuffer::SCANOUT }, |
- { gfx::GpuMemoryBuffer::RGBX_8888, gfx::GpuMemoryBuffer::SCANOUT } |
+ {gfx::GpuMemoryBuffer::RGBA_8888, gfx::GpuMemoryBuffer::SCANOUT}, |
+ {gfx::GpuMemoryBuffer::RGBX_8888, gfx::GpuMemoryBuffer::SCANOUT}, |
+#if defined(USE_OZONE_GBM) |
reveman
2015/05/11 16:40:56
There shouldn't be a USE_OZONE_GBM ifdef here. I t
dshwang
2015/05/14 12:25:46
Done.
|
+ {gfx::GpuMemoryBuffer::BGRA_8888, gfx::GpuMemoryBuffer::MAP} |
+#endif |
}; |
} // namespace |
@@ -58,13 +61,13 @@ GpuMemoryBufferFactoryOzoneNativeBuffer::CreateGpuMemoryBuffer( |
gfx::GpuMemoryBuffer::Usage usage, |
int client_id, |
gfx::PluginWindowHandle surface_handle) { |
- if (!ozone_native_buffer_factory_.CreateGpuMemoryBuffer( |
- id, size, format, usage, client_id, surface_handle)) { |
- return gfx::GpuMemoryBufferHandle(); |
- } |
gfx::GpuMemoryBufferHandle handle; |
handle.type = gfx::OZONE_NATIVE_BUFFER; |
handle.id = id; |
+ if (!ozone_native_buffer_factory_.CreateGpuMemoryBuffer( |
+ id, size, format, usage, client_id, surface_handle, &handle)) { |
+ return gfx::GpuMemoryBufferHandle(); |
+ } |
return handle; |
} |