PPAPI/NaCl: Make NaClIPCAdapter transfer handles more generally

ppapi/proxy/ppb_audio_proxy.cc

 // Copyright (c) 2012 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 "ppapi/proxy/ppb_audio_proxy.h"
 
 #include "base/compiler_specific.h"
 #include "base/threading/simple_thread.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_audio.h"
@@ skipping 234 matching lines @@
     result_code = GetAudioConnectedHandles(resource, &socket_handle,
                                            &shared_memory,
                                            &shared_memory_length);
   }
 
   // Send all the values, even on error. This simplifies some of our cleanup
   // code since the handles will be in the other process and could be
   // inconvenient to clean up. Our IPC code will automatically handle this for
   // us, as long as the remote side always closes the handles it receives
   // (in OnMsgNotifyAudioStreamCreated), even in the failure case.
+  ppapi::proxy::SerializedHandle fd_wrapper(socket_handle);
+  ppapi::proxy::SerializedHandle handle_wrapper(
+      shared_memory, shared_memory_length + sizeof(int32_t));
   dispatcher()->Send(new PpapiMsg_PPBAudio_NotifyAudioStreamCreated(
-      API_ID_PPB_AUDIO, resource, result_code, socket_handle,
-      shared_memory, shared_memory_length));
+      API_ID_PPB_AUDIO, resource, result_code, fd_wrapper, handle_wrapper));
 }
 
 int32_t PPB_Audio_Proxy::GetAudioConnectedHandles(
     const HostResource& resource,
     IPC::PlatformFileForTransit* foreign_socket_handle,
     base::SharedMemoryHandle* foreign_shared_memory_handle,
     uint32_t* shared_memory_length) {
   // Get the audio interface which will give us the handles.
   EnterHostFromHostResource<PPB_Audio_API> enter(resource);
   if (enter.failed())
@@ skipping 24 matching lines @@
   if (*foreign_shared_memory_handle == IPC::InvalidPlatformFileForTransit())
     return PP_ERROR_FAILED;
 
   return PP_OK;
 }
 
 // Processed in the plugin (message from host).
 void PPB_Audio_Proxy::OnMsgNotifyAudioStreamCreated(
     const HostResource& audio_id,
     int32_t result_code,
-    IPC::PlatformFileForTransit socket_handle,
-    base::SharedMemoryHandle handle,
-    uint32_t length) {
+    ppapi::proxy::SerializedHandle socket_handle,
+    ppapi::proxy::SerializedHandle handle) {
+  CHECK(socket_handle.is_socket());
+  CHECK(handle.is_shmem());
   EnterPluginFromHostResource<PPB_Audio_API> enter(audio_id);
   if (enter.failed() || result_code != PP_OK) {
     // The caller may still have given us these handles in the failure case.
     // The easiest way to clean these up is to just put them in the objects
     // and then close them. This failure case is not performance critical.
     base::SyncSocket temp_socket(
-        IPC::PlatformFileForTransitToPlatformFile(socket_handle));
-    base::SharedMemory temp_mem(handle, false);
+        IPC::PlatformFileForTransitToPlatformFile(socket_handle.descriptor()));
+    base::SharedMemory temp_mem(handle.shmem(), false);
   } else {
     static_cast<Audio*>(enter.object())->SetStreamInfo(
-        enter.resource()->pp_instance(), handle, length,
-        IPC::PlatformFileForTransitToPlatformFile(socket_handle));
+        enter.resource()->pp_instance(), handle.shmem(),
+        handle.size() - sizeof(int32_t),

[brettw, 2012/08/22 23:27:06]

Can you add a comment why you do "- sizeof(int32_t)"?

[dmichael (off chromium), 2012/08/23 22:55:14]

Oops, I meant to clean that up, thanks for pointing it out.

Instead of commenting here, I exposed a couple of appropriate functions in
PPB_Audio_Shared and used them here. Hopefully it's more self-documenting now.
This can get a little nicer when http://codereview.chromium.org/10826296/ lands.

+        IPC::PlatformFileForTransitToPlatformFile(socket_handle.descriptor()));
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi