PPAPI/NaCl: Make NaClIPCAdapter transfer handles more generally

ppapi/proxy/ppb_image_data_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_image_data_proxy.h"
 
 #include <string.h>  // For memcpy
 
 #include <vector>
 
@@ skipping 35 matching lines @@
 
 ImageData::ImageData(const HostResource& resource,
                      const PP_ImageDataDesc& desc,
                      const base::SharedMemoryHandle& handle)
     : Resource(OBJECT_IS_PROXY, resource),
       desc_(desc),
       shm_(handle, false /* read_only */),
       size_(desc.size.width * desc.size.height * 4),
       map_count_(0) {
 }
-#endif  // !defined(OS_NACL)
+#endif  // else, !defined(OS_NACL)
 
 ImageData::~ImageData() {
 }
 
 thunk::PPB_ImageData_API* ImageData::AsPPB_ImageData_API() {
   return this;
 }
 
 PP_Bool ImageData::Describe(PP_ImageDataDesc* desc) {
   memcpy(desc, &desc_, sizeof(PP_ImageDataDesc));
@@ skipping 89 matching lines @@
                                                      PP_ImageDataFormat format,
                                                      const PP_Size& size,
                                                      PP_Bool init_to_zero) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return 0;
 
   HostResource result;
   std::string image_data_desc;
 #if defined(OS_NACL)
-  base::SharedMemoryHandle image_handle = base::SharedMemory::NULLHandle();
+  ppapi::proxy::SerializedHandle image_handle_wrapper;
   dispatcher->Send(new PpapiHostMsg_PPBImageData_CreateNaCl(
       kApiID, instance, format, size, init_to_zero,
-      &result, &image_data_desc, &image_handle));
+      &result, &image_data_desc, &image_handle_wrapper));
+  if (!image_handle_wrapper.is_shmem())
+    return 0;
+  base::SharedMemoryHandle image_handle = image_handle_wrapper.shmem();
 #else
   ImageHandle image_handle = ImageData::NullHandle();
   dispatcher->Send(new PpapiHostMsg_PPBImageData_Create(
       kApiID, instance, format, size, init_to_zero,
       &result, &image_data_desc, &image_handle));
 #endif
 
   if (result.is_null() || image_data_desc.size() != sizeof(PP_ImageDataDesc))
     return 0;
 
@@ skipping 62 matching lines @@
 #endif  // defined(OS_NACL)
 }
 
 void PPB_ImageData_Proxy::OnHostMsgCreateNaCl(
     PP_Instance instance,
     int32_t format,
     const PP_Size& size,
     PP_Bool init_to_zero,
     HostResource* result,
     std::string* image_data_desc,
-    base::SharedMemoryHandle* result_image_handle) {
+    ppapi::proxy::SerializedHandle* result_image_handle) {
 #if defined(OS_NACL)
   // This message should never be received in untrusted code. To minimize the
   // size of the IRT, we just don't handle it.
   return;
 #else
-  *result_image_handle = base::SharedMemory::NULLHandle();
+  result_image_handle->set_null_shmem();
   HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return;
 
   thunk::EnterResourceCreation enter(instance);
   if (enter.failed())
     return;
 
   PP_Resource resource = enter.functions()->CreateImageDataNaCl(
       instance, static_cast<PP_ImageDataFormat>(format), size, init_to_zero);
   if (!resource)
     return;
   result->SetHostResource(instance, resource);
 
   // Get the description, it's just serialized as a string.
   thunk::EnterResourceNoLock<thunk::PPB_ImageData_API> enter_resource(
       resource, false);
   if (enter_resource.failed())
     return;
   PP_ImageDataDesc desc;
   if (enter_resource.object()->Describe(&desc) == PP_TRUE) {
     image_data_desc->resize(sizeof(PP_ImageDataDesc));
     memcpy(&(*image_data_desc)[0], &desc, sizeof(PP_ImageDataDesc));
   }
   int local_fd;
   uint32_t byte_count;
   if (enter_resource.object()->GetSharedMemory(&local_fd, &byte_count) != PP_OK)
     return;
-
   // TODO(dmichael): Change trusted interface to return a PP_FileHandle, those
   // casts are ugly.
   base::PlatformFile platform_file =
 #if defined(OS_WIN)
       reinterpret_cast<HANDLE>(static_cast<intptr_t>(local_fd));
 #elif defined(OS_POSIX)
       local_fd;
 #else
   #error Not implemented.
 #endif  // defined(OS_WIN)
-  *result_image_handle =
-      dispatcher->ShareHandleWithRemote(platform_file, false);
+  result_image_handle->set_shmem(
+      dispatcher->ShareHandleWithRemote(platform_file, false),
+      byte_count);
 #endif  // defined(OS_NACL)
 }
 
 }  // namespace proxy
 }  // namespace ppapi