Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Unified Diff: ui/ozone/public/native_pixmap_manager.cc

Issue 1248713002: ozone: ClientPixmapManager passes VGEM fd from browser to renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase to lastest crrev.com/1128113011 Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/ozone/public/native_pixmap_manager.h ('k') | ui/ozone/public/ozone_platform.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « ui/ozone/public/native_pixmap_manager.h ('k') | ui/ozone/public/ozone_platform.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698