| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/ozone/public/client_native_pixmap_manager.h" | 5 #include "ui/ozone/public/client_native_pixmap_manager.h" |
| 6 | 6 |
| 7 #include "base/trace_event/trace_event.h" | 7 #include "base/trace_event/trace_event.h" |
| 8 #include "ui/ozone/platform_object.h" | 8 #include "ui/ozone/platform_object.h" |
| 9 #include "ui/ozone/platform_selection.h" | 9 #include "ui/ozone/platform_selection.h" |
| 10 | 10 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 | 23 |
| 24 // static | 24 // static |
| 25 void ClientNativePixmapManager::SetInstance( | 25 void ClientNativePixmapManager::SetInstance( |
| 26 ClientNativePixmapManager* instance) { | 26 ClientNativePixmapManager* instance) { |
| 27 DCHECK(!g_instance); | 27 DCHECK(!g_instance); |
| 28 DCHECK(instance); | 28 DCHECK(instance); |
| 29 g_instance = instance; | 29 g_instance = instance; |
| 30 } | 30 } |
| 31 | 31 |
| 32 // static | 32 // static |
| 33 scoped_ptr<ClientNativePixmapManager> ClientNativePixmapManager::Create() { | 33 scoped_ptr<ClientNativePixmapManager> ClientNativePixmapManager::Create( |
| 34 const base::FileDescriptor& virtual_device) { |
| 34 TRACE_EVENT1("ozone", "ClientNativePixmapManager::Create", "platform", | 35 TRACE_EVENT1("ozone", "ClientNativePixmapManager::Create", "platform", |
| 35 GetOzonePlatformName()); | 36 GetOzonePlatformName()); |
| 36 return PlatformObject<ClientNativePixmapManager>::Create(); | 37 scoped_ptr<ClientNativePixmapManager> manager = |
| 38 PlatformObject<ClientNativePixmapManager>::Create(); |
| 39 manager->Initialize(virtual_device); |
| 40 return manager.Pass(); |
| 37 } | 41 } |
| 38 | 42 |
| 39 ClientNativePixmapManager::ClientNativePixmapManager() {} | 43 ClientNativePixmapManager::ClientNativePixmapManager() {} |
| 40 | 44 |
| 41 ClientNativePixmapManager::~ClientNativePixmapManager() {} | 45 ClientNativePixmapManager::~ClientNativePixmapManager() {} |
| 42 | 46 |
| 43 } // namespace ui | 47 } // namespace ui |
| OLD | NEW |