Index: ui/ozone/public/native_pixmap_manager.cc |
diff --git a/ui/ozone/public/native_pixmap_manager.cc b/ui/ozone/public/native_pixmap_manager.cc |
index f030e548b04c76decc3a27dce425302394048faa..c07d66f13a7f8eeac94bd22a6d5df826899ae412 100644 |
--- a/ui/ozone/public/native_pixmap_manager.cc |
+++ b/ui/ozone/public/native_pixmap_manager.cc |
@@ -22,19 +22,20 @@ NativePixmapManager* NativePixmapManager::GetInstance() { |
} |
// static |
-void NativePixmapManager::SetInstance( |
- scoped_ptr<NativePixmapManager> instance) { |
+void NativePixmapManager::SetInstance(NativePixmapManager* instance) { |
DCHECK(!g_instance); |
DCHECK(instance); |
- g_instance = instance.release(); |
+ g_instance = instance; |
} |
// static |
-scoped_ptr<NativePixmapManager> NativePixmapManager::Create() { |
+scoped_ptr<NativePixmapManager> NativePixmapManager::Create( |
+ const base::FileDescriptor& device_fd) { |
TRACE_EVENT1("ozone", "NativePixmapManager::Create", "platform", |
GetOzonePlatformName()); |
scoped_ptr<NativePixmapManager> manager = |
PlatformObject<NativePixmapManager>::Create(); |
+ manager->Initialize(device_fd); |
return manager.Pass(); |
} |