Add ClientNativePixmap multi-planar support.

ui/ozone/platform/drm/client_native_pixmap_factory_gbm.cc

 // Copyright 2015 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 "ui/ozone/platform/drm/client_native_pixmap_factory_gbm.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "ui/gfx/native_pixmap_handle.h"
 #include "ui/ozone/platform/drm/common/client_native_pixmap_dmabuf.h"
 #include "ui/ozone/public/client_native_pixmap_factory.h"
 
 namespace ui {
 
 namespace {
 
 class ClientNativePixmapGbm : public ClientNativePixmap {
  public:
   ClientNativePixmapGbm() {}
   ~ClientNativePixmapGbm() override {}
 
-  void* Map() override {
+  bool Map() override {
+    NOTREACHED();
+    return false;
+  }
+  void Unmap() override { NOTREACHED(); }
+  void* GetMemoryAddress(size_t plane) const override {
     NOTREACHED();
     return nullptr;
   }
-  void Unmap() override { NOTREACHED(); }
-  void GetStride(int* stride) const override { NOTREACHED(); }
+  int GetStride(size_t plane) const override {
+    NOTREACHED();
+    return 0;
+  }
 };
 
 }  // namespace
 
 class ClientNativePixmapFactoryGbm : public ClientNativePixmapFactory {
  public:
   ClientNativePixmapFactoryGbm() {}
   ~ClientNativePixmapFactoryGbm() override {}
 
   // ClientNativePixmapFactory:
@@ skipping 26 matching lines @@
       }
     }
     NOTREACHED();
     return false;
   }
   std::unique_ptr<ClientNativePixmap> ImportFromHandle(
       const gfx::NativePixmapHandle& handle,
       const gfx::Size& size,
       gfx::BufferUsage usage) override {
     DCHECK(!handle.fds.empty());
-    base::ScopedFD scoped_fd(handle.fds[0].fd);
     switch (usage) {
       case gfx::BufferUsage::GPU_READ_CPU_READ_WRITE:
       case gfx::BufferUsage::GPU_READ_CPU_READ_WRITE_PERSISTENT:
 #if defined(OS_CHROMEOS)

[dnicoara, 2016/09/14 21:47:40]

On the non-CrOS case this would be leaking the FDs.

[Daniele Castagna, 2016/09/19 18:26:39]

True, but the non-CrOS case should never be reached, right?

-        // TODO(dcastagna): Add support for pixmaps with multiple FDs for non
-        // scanout buffers.
-        return ClientNativePixmapDmaBuf::ImportFromDmabuf(
-            scoped_fd.release(), size, handle.planes[0].stride);
+        return ClientNativePixmapDmaBuf::ImportFromDmabuf(handle, size);
 #else
         NOTREACHED();
         return nullptr;
 #endif
       case gfx::BufferUsage::GPU_READ:
       case gfx::BufferUsage::SCANOUT:
+        // Close all the fds.
+        for (const auto& fd : handle.fds)
+          base::ScopedFD scoped_fd(fd.fd);
         return base::WrapUnique(new ClientNativePixmapGbm);
     }
     NOTREACHED();
     return nullptr;
   }
 
   DISALLOW_COPY_AND_ASSIGN(ClientNativePixmapFactoryGbm);
 };
 
 ClientNativePixmapFactory* CreateClientNativePixmapFactoryGbm() {
   return new ClientNativePixmapFactoryGbm();
 }
 
 }  // namespace ui