gfx: Fix [de]serializing non-shm GpuMemoryBufferHandle.

ui/gfx/mojo/struct_traits_unittest.cc

 // Copyright 2016 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 "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/mojo/traits_test_service.mojom.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/selection_bound.h"
@@ skipping 126 matching lines @@
   mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
   gfx::AcceleratedWidget output;
   proxy->EchoAcceleratedWidget(input, &output);
   EXPECT_EQ(input, output);
 }
 
 TEST_F(StructTraitsTest, GpuMemoryBufferHandle) {
   const gfx::GpuMemoryBufferId kId(99);
   const uint32_t kOffset = 126;
   const int32_t kStride = 256;
-#if defined(USE_OZONE)
-  const uint64_t kSize = kOffset + kStride;
-  const uint64_t kModifier = 2;
-#endif
   base::SharedMemory shared_memory;
   ASSERT_TRUE(shared_memory.CreateAnonymous(1024));
   ASSERT_TRUE(shared_memory.Map(1024));
 
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::SHARED_MEMORY_BUFFER;
   handle.id = kId;
   handle.handle = base::SharedMemory::DuplicateHandle(shared_memory.handle());
   handle.offset = kOffset;
   handle.stride = kStride;
 
-#if defined(USE_OZONE)
-  handle.native_pixmap_handle.planes.emplace_back(kOffset, kStride, kSize,
-                                                  kModifier);
-#endif
-
   mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
   gfx::GpuMemoryBufferHandle output;
   proxy->EchoGpuMemoryBufferHandle(handle, &output);
   EXPECT_EQ(gfx::SHARED_MEMORY_BUFFER, output.type);
   EXPECT_EQ(kId, output.id);
   EXPECT_EQ(kOffset, output.offset);
   EXPECT_EQ(kStride, output.stride);
 
-#if defined(USE_OZONE)
-  ASSERT_EQ(1u, output.native_pixmap_handle.planes.size());
-  EXPECT_EQ(kSize, output.native_pixmap_handle.planes.back().size);
-  EXPECT_EQ(kModifier, output.native_pixmap_handle.planes.back().modifier);
-#endif
-
 #if !defined(OS_MACOSX) && !defined(OS_IOS)
   // TODO: Add support for mach_port on mac.
   base::SharedMemory output_memory(output.handle, true);
   EXPECT_TRUE(output_memory.Map(1024));
 #endif
+
+#if defined(USE_OZONE)
+  const uint64_t kSize = kOffset + kStride;
+  const uint64_t kModifier = 2;
+  handle.type = gfx::OZONE_NATIVE_PIXMAP;
+  handle.id = kId;
+  handle.native_pixmap_handle.planes.emplace_back(kOffset, kStride, kSize,
+                                                  kModifier);
+  proxy->EchoGpuMemoryBufferHandle(handle, &output);
+  EXPECT_EQ(gfx::OZONE_NATIVE_PIXMAP, output.type);
+  EXPECT_EQ(kId, output.id);
+  ASSERT_EQ(1u, output.native_pixmap_handle.planes.size());
+  EXPECT_EQ(kSize, output.native_pixmap_handle.planes.back().size);
+  EXPECT_EQ(kModifier, output.native_pixmap_handle.planes.back().modifier);
+#endif
 }
 
 TEST_F(StructTraitsTest, NullGpuMemoryBufferHandle) {
   mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
   GpuMemoryBufferHandle output;
   proxy->EchoGpuMemoryBufferHandle(GpuMemoryBufferHandle(), &output);
   EXPECT_TRUE(output.is_null());
 }
 
 }  // namespace gfx