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

Unified Diff: content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc

Issue 1381133002: ozone: Implement support for CreateGpuMemoryBufferFromHandle for OzoneNativePixmap backed GMBs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gmb-factory-create-from-handle
Patch Set: rebase Created 5 years, 2 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
Index: content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc
diff --git a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc
index c7030d1b66b02dffe8d6d7d2751ea1ddd3c69cb2..77c230068f78a93a719301e149d41bb8a8fe026f 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc
+++ b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc
@@ -71,8 +71,23 @@ GpuMemoryBufferFactoryOzoneNativePixmap::CreateGpuMemoryBufferFromHandle(
const gfx::Size& size,
gfx::BufferFormat format,
int client_id) {
- NOTIMPLEMENTED();
- return gfx::GpuMemoryBufferHandle();
+ scoped_refptr<ui::NativePixmap> pixmap =
+ ui::OzonePlatform::GetInstance()
+ ->GetSurfaceFactoryOzone()
+ ->CreateNativePixmapFromHandle(handle.native_pixmap_handle);
+ if (!pixmap.get()) {
+ LOG(ERROR) << "Failed to create pixmap from handle";
piman 2015/10/08 23:24:36 nit: DLOG?
reveman 2015/10/09 12:47:02 Done. Here and above for consistency.
+ return gfx::GpuMemoryBufferHandle();
+ }
+
+ {
+ base::AutoLock lock(native_pixmaps_lock_);
+ NativePixmapMapKey key(id.id, client_id);
+ DCHECK(native_pixmaps_.find(key) == native_pixmaps_.end());
+ native_pixmaps_[key] = pixmap;
+ }
+
+ return handle;
}
void GpuMemoryBufferFactoryOzoneNativePixmap::DestroyGpuMemoryBuffer(

Powered by Google App Engine
This is Rietveld 408576698