Allow Mach shm to be passed to NaCl.

components/nacl/loader/nacl_ipc_adapter.cc

 // Copyright 2013 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/nacl/loader/nacl_ipc_adapter.h"
 
 #include <limits.h>
 #include <string.h>
 
 #include "base/basictypes.h"
@@ skipping 209 matching lines @@
     NaClDescUnref(desc_);
   }
 
   NaClDesc* desc() { return desc_; }
 
  private:
   NaClDesc* desc_;
   DISALLOW_COPY_AND_ASSIGN(NaClDescWrapper);
 };
 
+scoped_ptr<NaClDescWrapper> MakeShmNaClDesc(
+    const base::SharedMemoryHandle& handle,
+    size_t size) {
+#if defined(OS_MACOSX)
+  if (handle.GetType() == base::SharedMemoryHandle::MACH) {
+    return scoped_ptr<NaClDescWrapper>(new NaClDescWrapper(
+        NaClDescImcShmMachMake(handle.GetMemoryObject(), size)));
+  }
+  CHECK_EQ(base::SharedMemoryHandle::POSIX, handle.GetType());
+#endif
+
+  return scoped_ptr<NaClDescWrapper>(new NaClDescWrapper(NaClDescImcShmMake(
+#if defined(OS_WIN)
+      handle.GetHandle(),
+#else
+      base::SharedMemory::GetFdFromSharedMemoryHandle(handle),
+#endif
+      size)));
+}
+
 }  // namespace
 
 class NaClIPCAdapter::RewrittenMessage
     : public base::RefCounted<RewrittenMessage> {
  public:
   RewrittenMessage();
 
   bool is_consumed() const { return data_read_cursor_ == data_len_; }
 
   void SetData(const NaClIPCAdapter::NaClMessageHeader& header,
@@ skipping 294 matching lines @@
       return false;
 
     // Now add any descriptors we found to rewritten_msg. |handles| is usually
     // empty, unless we read a message containing a FD or handle.
     for (Handles::const_iterator iter = handles.begin();
          iter != handles.end();
          ++iter) {
       scoped_ptr<NaClDescWrapper> nacl_desc;
       switch (iter->type()) {
         case ppapi::proxy::SerializedHandle::SHARED_MEMORY: {
-          const base::SharedMemoryHandle& shm_handle = iter->shmem();
-          uint32_t size = iter->size();
-          nacl_desc.reset(new NaClDescWrapper(NaClDescImcShmMake(
-#if defined(OS_WIN)
-              shm_handle.GetHandle(),
-#else
-              base::SharedMemory::GetFdFromSharedMemoryHandle(shm_handle),
-#endif
-              static_cast<size_t>(size))));
+          nacl_desc =

[Mark Seaborn, 2015/11/20 21:57:19]

Nit: the other cases do nacl_desc.reset() (though presumably it's equivalent)

[erikchen, 2015/11/20 22:00:46]

nacl_desc.reset() is being used on a raw pointer. We can use reset() here a
well, but we'd need to call .Pass() or .release() on MakeShmNaClDesc() to
convert the return value back to a raw pointer. Seems like additional effort for
no benefit?

[Mark Seaborn, 2015/11/20 22:42:36]

OK, please leave it as it is, then.  I hadn't realised the difference.

+              MakeShmNaClDesc(iter->shmem(), static_cast<size_t>(iter->size()));
           break;
         }
         case ppapi::proxy::SerializedHandle::SOCKET: {
           nacl_desc.reset(new NaClDescWrapper(NaClDescSyncSocketMake(
 #if defined(OS_WIN)
               iter->descriptor()
 #else
               iter->descriptor().fd
 #endif
           )));
@@ skipping 264 matching lines @@
   header.flags = msg.flags();
   header.num_fds = static_cast<uint16>(rewritten_msg->desc_count());
 
   rewritten_msg->SetData(header, msg.payload(), msg.payload_size());
   locked_data_.to_be_received_.push(rewritten_msg);
 }
 
 int TranslatePepperFileReadWriteOpenFlagsForTesting(int32_t pp_open_flags) {
   return TranslatePepperFileReadWriteOpenFlags(pp_open_flags);
 }