Add a size parameter to SharedMemoryHandle.

ui/gfx/mojo/buffer_types_struct_traits.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 "ui/gfx/mojo/buffer_types_struct_traits.h"
 
 #include "mojo/public/cpp/system/platform_handle.h"
 
 namespace mojo {
 
@@ skipping 42 matching lines @@
       return false;
     constexpr bool auto_close = true;
     out->fds.push_back(base::FileDescriptor(platform_file, auto_close));
   }
   return data.ReadPlanes(&out->planes);
 #else
   return false;
 #endif
 }
 
-mojo::ScopedHandle StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView,
-                                gfx::GpuMemoryBufferHandle>::
+mojo::ScopedSharedBufferHandle
+StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView,
+             gfx::GpuMemoryBufferHandle>::
     shared_memory_handle(const gfx::GpuMemoryBufferHandle& handle) {
   if (handle.type != gfx::SHARED_MEMORY_BUFFER)
-    return mojo::ScopedHandle();
-#if defined(OS_MACOSX)
-  base::SharedMemoryHandle shm_handle = handle.handle;
-  size_t num_bytes = 0;
-  if (!shm_handle.GetSize(&num_bytes))
-    return mojo::ScopedHandle();
-  mojo::ScopedSharedBufferHandle scoped_handle =
-      mojo::WrapSharedMemoryHandle(shm_handle, num_bytes, false);
-  mojo::Handle mojo_handle = scoped_handle.release();
-  return mojo::MakeScopedHandle(mojo_handle);
-#else  // defined(OS_MACOSX)
-  base::PlatformFile platform_file = handle.handle.GetHandle();
-  return mojo::WrapPlatformFile(platform_file);
-#endif  // defined(OS_MACOSX)
+    return mojo::ScopedSharedBufferHandle();
+  return mojo::WrapSharedMemoryHandle(handle.handle, handle.handle.GetSize(),
+                                      false);
 }
 
 const gfx::NativePixmapHandle&
 StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView,
              gfx::GpuMemoryBufferHandle>::
     native_pixmap_handle(const gfx::GpuMemoryBufferHandle& handle) {
 #if defined(OS_LINUX)
   return handle.native_pixmap_handle;
 #else
   static gfx::NativePixmapHandle pixmap_handle;
@@ skipping 14 matching lines @@
 }
 
 bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView,
                   gfx::GpuMemoryBufferHandle>::
     Read(gfx::mojom::GpuMemoryBufferHandleDataView data,
          gfx::GpuMemoryBufferHandle* out) {
   if (!data.ReadType(&out->type) || !data.ReadId(&out->id))
     return false;
 
   if (out->type == gfx::SHARED_MEMORY_BUFFER) {
-    mojo::ScopedHandle handle = data.TakeSharedMemoryHandle();
+    mojo::ScopedSharedBufferHandle handle = data.TakeSharedMemoryHandle();
     if (handle.is_valid()) {
-#if defined(OS_MACOSX)
-      mojo::Handle mojo_handle = handle.release();
-      mojo::ScopedSharedBufferHandle buffer_handle =
-          mojo::MakeScopedHandle(mojo::SharedBufferHandle(mojo_handle.value()));
       MojoResult unwrap_result = mojo::UnwrapSharedMemoryHandle(
-          std::move(buffer_handle), &out->handle, nullptr, nullptr);
+          std::move(handle), &out->handle, nullptr, nullptr);
       if (unwrap_result != MOJO_RESULT_OK)
         return false;
-#else  // defined(OS_MACOSX)
-      base::PlatformFile platform_file;
-      MojoResult unwrap_result =
-          mojo::UnwrapPlatformFile(std::move(handle), &platform_file);
-      if (unwrap_result != MOJO_RESULT_OK)
-        return false;
-      // TODO(rockot): Pass GUIDs through Mojo. https://crbug.com/713763.
-      // TODO(erikchen): During serialization, the SharedMemoryHandle is
-      // decomposed on Linux into a file_descriptor. The serialization path
-      // should be changed to serialize a Mojo shared buffer instead.
-      // https://crbug.com/713763.
-      base::UnguessableToken guid = base::UnguessableToken::Create();
-#if defined(OS_WIN)
-      out->handle = base::SharedMemoryHandle(platform_file, guid);
-#else
-      out->handle = base::SharedMemoryHandle(
-          base::FileDescriptor(platform_file, true), guid);
-#endif
-#endif  // defined(OS_MACOSX)
     }
 
     out->offset = data.offset();
     out->stride = data.stride();
   }
 #if defined(OS_LINUX)
   if (out->type == gfx::NATIVE_PIXMAP &&
       !data.ReadNativePixmapHandle(&out->native_pixmap_handle))
     return false;
 #endif
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   if (out->type == gfx::IO_SURFACE_BUFFER) {
     mach_port_t mach_port;
     MojoResult unwrap_result =
         mojo::UnwrapMachPort(data.TakeMachPort(), &mach_port);
     if (unwrap_result != MOJO_RESULT_OK)
       return false;
     out->mach_port.reset(mach_port);
   }
 #endif
   return true;
 }
 
 }  // namespace mojo