Add NativePixmapHandle type & interface for exporting them

content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc

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 d3e0576124a9be60c8f6e67f2dddfbc0ca0f63d8..2572162d3badd575ed05e8d35e38b3c07a2dd2e6 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
@@ -5,6 +5,7 @@
 #include "content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h"
 
 #include "ui/gl/gl_image_ozone_native_pixmap.h"
+#include "ui/ozone/public/client_native_pixmap.h"
 #include "ui/ozone/public/client_native_pixmap_factory.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
@@ -70,15 +71,20 @@ GpuMemoryBufferFactoryOzoneNativePixmap::CreateGpuMemoryBuffer(
                << ", usage " << static_cast<int>(usage);
     return gfx::GpuMemoryBufferHandle();
   }
-  base::AutoLock lock(native_pixmaps_lock_);
-  NativePixmapMapKey key(id, client_id);
-  DCHECK(native_pixmaps_.find(key) == native_pixmaps_.end())
-      << "pixmap with this key must not exist";
-  native_pixmaps_[key] = pixmap;
 
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::OZONE_NATIVE_PIXMAP;
   handle.id = id;
+  handle.native_pixmap_handle = pixmap->ExportHandle();
+
+  {
+    base::AutoLock lock(native_pixmaps_lock_);
+    NativePixmapMapKey key(id, client_id);
+    DCHECK(native_pixmaps_.find(key) == native_pixmaps_.end())
+        << "pixmap with this key must not exist";

[reveman, 2015/08/05 13:58:52]

not new to this patch but I think this log output is overkill. we have similar
dchecks in a lot of places but never log a string like this as the code itself
makes that obvious.

[spang, 2015/08/05 14:06:18]

Agreed, it looked verbose to me as well. Done.

+    native_pixmaps_[key] = pixmap;
+  }
+
   return handle;
 }