Add NativePixmapHandle type & interface for exporting them

content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 
 namespace content {
 namespace {
 
 void GetSupportedConfigurations(
     std::vector<GpuMemoryBufferFactory::Configuration>* configurations) {
   std::vector<ui::ClientNativePixmapFactory::Configuration>
@@ skipping 45 matching lines @@
   scoped_refptr<ui::NativePixmap> pixmap =
       ui::OzonePlatform::GetInstance()
           ->GetSurfaceFactoryOzone()
           ->CreateNativePixmap(surface_handle, size, format, usage);
   if (!pixmap.get()) {
     LOG(ERROR) << "Failed to create pixmap " << size.width() << "x"
                << size.height() << " format " << static_cast<int>(format)
                << ", 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;
+
+  if (usage == gfx::BufferUsage::MAP &&

[reveman, 2015/08/05 04:18:00]

Can you remove the MAP check from here and not fail if ExportHandle fails? We
might have other usage modes that require the handle and maybe SCANOUT will in
the future. MAP_PERSISTENT does for example. We'd fail later if the supported
configurations are not correct anyhow.

[spang, 2015/08/05 13:26:15]

Done.. now it imports scanout as well.

It is not useful to import them other than unifying code paths, though, since
they are only used by name.

+      !pixmap->ExportHandle(&handle.native_pixmap_handle))
+    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;
+  }
+
   return handle;
 }
 
 void GpuMemoryBufferFactoryOzoneNativePixmap::DestroyGpuMemoryBuffer(
     gfx::GpuMemoryBufferId id,
     int client_id) {
   base::AutoLock lock(native_pixmaps_lock_);
   auto it = native_pixmaps_.find(NativePixmapMapKey(id, client_id));
   DCHECK(it != native_pixmaps_.end()) << "pixmap with this key must exist";
   native_pixmaps_.erase(it);
@@ skipping 25 matching lines @@
   scoped_refptr<gfx::GLImageOzoneNativePixmap> image(
       new gfx::GLImageOzoneNativePixmap(size, internalformat));
   if (!image->Initialize(pixmap.get(), format)) {
     LOG(ERROR) << "Failed to create GLImage";
     return nullptr;
   }
   return image;
 }
 
 }  // namespace content