X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcontent%2Fcommon%2Fgpu%2Fgpu_memory_buffer_factory_ozone.cc;h=0ec6d34a7c44ee2ece3701cf5ca5339fd5b09e26;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=8f4232dc452f5cd8c46895aa13e85e8506499ae3;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/content/common/gpu/gpu_memory_buffer_factory_ozone.cc b/src/content/common/gpu/gpu_memory_buffer_factory_ozone.cc index 8f4232d..0ec6d34 100644 --- a/src/content/common/gpu/gpu_memory_buffer_factory_ozone.cc +++ b/src/content/common/gpu/gpu_memory_buffer_factory_ozone.cc @@ -22,9 +22,8 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory { unsigned usage) OVERRIDE { switch (handle.type) { case gfx::OZONE_NATIVE_BUFFER: - return ui::GpuMemoryBufferFactoryOzoneNativeBuffer::GetInstance() - ->CreateGpuMemoryBuffer( - handle.global_id, size, internalformat, usage) + return ozone_buffer_factory_.CreateGpuMemoryBuffer( + handle.global_id, size, internalformat, usage) ? handle : gfx::GpuMemoryBufferHandle(); default: @@ -36,8 +35,7 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory { const gfx::GpuMemoryBufferHandle& handle) OVERRIDE { switch (handle.type) { case gfx::OZONE_NATIVE_BUFFER: - ui::GpuMemoryBufferFactoryOzoneNativeBuffer::GetInstance() - ->DestroyGpuMemoryBuffer(handle.global_id); + ozone_buffer_factory_.DestroyGpuMemoryBuffer(handle.global_id); break; default: NOTREACHED(); @@ -63,14 +61,16 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory { if (handle.global_id.secondary_id != client_id) return scoped_refptr(); - return ui::GpuMemoryBufferFactoryOzoneNativeBuffer::GetInstance() - ->CreateImageForGpuMemoryBuffer( - handle.global_id, size, internalformat); + return ozone_buffer_factory_.CreateImageForGpuMemoryBuffer( + handle.global_id, size, internalformat); default: NOTREACHED(); return scoped_refptr(); } } + + private: + ui::GpuMemoryBufferFactoryOzoneNativeBuffer ozone_buffer_factory_; }; } // namespace