exo: Add support for wl_drm version 2 to wayland bindings.

components/exo/display_unittest.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 "components/exo/buffer.h"
 #include "components/exo/display.h"
 #include "components/exo/shared_memory.h"
 #include "components/exo/shell_surface.h"
 #include "components/exo/sub_surface.h"
 #include "components/exo/surface.h"
 #include "components/exo/test/exo_test_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(USE_OZONE)
+#include "ui/ozone/public/native_pixmap.h"
+#include "ui/ozone/public/ozone_platform.h"
+#include "ui/ozone/public/surface_factory_ozone.h"
+#endif
+
 namespace exo {
 namespace {
 
 using DisplayTest = test::ExoTestBase;
 
 TEST_F(DisplayTest, CreateSurface) {
   scoped_ptr<Display> display(new Display);
 
   // Creating a surface should succeed.
   scoped_ptr<Surface> surface = display->CreateSurface();
@@ skipping 15 matching lines @@
   // Creating a shared memory instance from a valid handle should succeed.
   scoped_ptr<SharedMemory> shm1 = display->CreateSharedMemory(handle, shm_size);
   EXPECT_TRUE(shm1);
 
   // Creating a shared memory instance from a invalid handle should fail.
   scoped_ptr<SharedMemory> shm2 =
       display->CreateSharedMemory(base::SharedMemoryHandle(), shm_size);
   EXPECT_FALSE(shm2);
 }
 
+#if defined(USE_OZONE)
+TEST_F(DisplayTest, CreatePrimeBuffer) {
+  const gfx::Size buffer_size(256, 256);
+  const uint32_t drm_format = 0x34324241;  // DRM_FORMAT_ABGR8888
+
+  scoped_ptr<Display> display(new Display);
+
+  // Creating a prime buffer from a native pixmap handle should succeed.
+  scoped_refptr<ui::NativePixmap> pixmap =
+      ui::OzonePlatform::GetInstance()
+          ->GetSurfaceFactoryOzone()
+          ->CreateNativePixmap(gfx::kNullAcceleratedWidget, buffer_size,
+                               gfx::BufferFormat::RGBA_8888,
+                               gfx::BufferUsage::GPU_READ);
+  gfx::NativePixmapHandle native_pixmap_handle = pixmap->ExportHandle();
+  scoped_ptr<Buffer> buffer1 = display->CreatePrimeBuffer(
+      base::ScopedFD(native_pixmap_handle.fd.fd), buffer_size, drm_format,

[piman, 2015/11/20 19:40:34]

drm_format? Doesn't CreatePrimeBuffer take a gfx::BufferFormat instead?

[reveman, 2015/11/20 20:53:52]

Done. Forgot to update this when changing this from a previous patch..

+      native_pixmap_handle.stride);
+  EXPECT_TRUE(buffer1);
+
+  // Creating a prime buffer using an invalid fd should fail.
+  scoped_ptr<Buffer> buffer2 = display->CreatePrimeBuffer(
+      base::ScopedFD(), buffer_size, drm_format, buffer_size.width() * 4);
+  EXPECT_FALSE(buffer2);
+}
+#endif
+
 TEST_F(DisplayTest, CreateShellSurface) {
   scoped_ptr<Display> display(new Display);
 
   // Create two surfaces.
   scoped_ptr<Surface> surface1 = display->CreateSurface();
   ASSERT_TRUE(surface1);
   scoped_ptr<Surface> surface2 = display->CreateSurface();
   ASSERT_TRUE(surface2);
 
   // Create a shell surface for surface1.
@@ skipping 67 matching lines @@
   // Attempting to create a sub surface for parent with grandchild as its parent
   // should fail.
   EXPECT_FALSE(display->CreateSubSurface(parent.get(), grandchild.get()));
 
   // Create a sub surface for parent.
   EXPECT_TRUE(display->CreateSubSurface(parent.get(), toplevel.get()));
 }
 
 }  // namespace
 }  // namespace exo