Chromium Code Reviews| Index: content/child/child_gpu_memory_buffer_manager.cc |
| diff --git a/content/child/child_gpu_memory_buffer_manager.cc b/content/child/child_gpu_memory_buffer_manager.cc |
| index 5513e5904becf6a58e3ac99ae04a169acbb6c5b5..beea2d3e63955c375cd7fd25a5d28f9429f187cd 100644 |
| --- a/content/child/child_gpu_memory_buffer_manager.cc |
| +++ b/content/child/child_gpu_memory_buffer_manager.cc |
| @@ -7,6 +7,10 @@ |
| #include "content/common/child_process_messages.h" |
| #include "content/common/gpu/client/gpu_memory_buffer_impl.h" |
| +#if defined(USE_OZONE) |
| +#include "content/child/child_native_pixmap_manager_ozone.h" |
| +#endif |
| + |
| namespace content { |
| namespace { |
| @@ -40,6 +44,13 @@ ChildGpuMemoryBufferManager::AllocateGpuMemoryBuffer( |
| "height", |
| size.height()); |
| +#if defined(USE_OZONE) |
| + if (!ui::NativePixmapManager::GetInstance()) { |
| + ui::NativePixmapManager::SetInstance( |
| + ChildNativePixmapManager::CreateSingleton(sender_.get())); |
|
dshwang
2015/07/06 18:45:01
Make the singleton ChildNativePixmapManager here w
|
| + } |
| +#endif |
| + |
| gfx::GpuMemoryBufferHandle handle; |
| IPC::Message* message = new ChildProcessHostMsg_SyncAllocateGpuMemoryBuffer( |
| size.width(), size.height(), format, usage, &handle); |