PPAPI/NaCl: Make NaClIPCAdapter transfer handles more generally

ppapi/proxy/ppb_image_data_proxy.cc

Index: ppapi/proxy/ppb_image_data_proxy.cc
diff --git a/ppapi/proxy/ppb_image_data_proxy.cc b/ppapi/proxy/ppb_image_data_proxy.cc
index 2eecc0ffe19972c0a1d4921f2754dda2df14e40c..aec48895829872dfdade268b73292a39582ec439 100644
--- a/ppapi/proxy/ppb_image_data_proxy.cc
+++ b/ppapi/proxy/ppb_image_data_proxy.cc
@@ -22,7 +22,7 @@
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
 
-#if !defined(OS_NACL)
+#if !defined(OS_NACL) && !defined(NACL_WIN64)
 #include "skia/ext/platform_canvas.h"
 #include "ui/surface/transport_dib.h"
 #endif
@@ -30,7 +30,7 @@
 namespace ppapi {
 namespace proxy {
 
-#if !defined(OS_NACL)
+#if !defined(OS_NACL) && !defined(NACL_WIN64)
 ImageData::ImageData(const HostResource& resource,
                      const PP_ImageDataDesc& desc,
                      ImageHandle handle)
@@ -42,7 +42,7 @@ ImageData::ImageData(const HostResource& resource,
   transport_dib_.reset(TransportDIB::Map(handle));
 #endif  // defined(OS_WIN)
 }
-#else  // !defined(OS_NACL)
+#else  // !defined(OS_NACL) && !defined(NACL_WIN64)
 
 ImageData::ImageData(const HostResource& resource,
                      const PP_ImageDataDesc& desc,
@@ -53,7 +53,7 @@ ImageData::ImageData(const HostResource& resource,
       size_(desc.size.width * desc.size.height * 4),
       map_count_(0) {
 }
-#endif  // !defined(OS_NACL)
+#endif  // else, !defined(OS_NACL) && !defined(NACL_WIN64)
 
 ImageData::~ImageData() {
 }
@@ -68,7 +68,7 @@ PP_Bool ImageData::Describe(PP_ImageDataDesc* desc) {
 }
 
 void* ImageData::Map() {
-#if defined(OS_NACL)
+#if defined(OS_NACL) || defined(NACL_WIN64)
   if (map_count_++ == 0)
     shm_.Map(size_);
   return shm_.memory();
@@ -88,7 +88,7 @@ void* ImageData::Map() {
 }
 
 void ImageData::Unmap() {
-#if defined(OS_NACL)
+#if defined(OS_NACL) || defined(NACL_WIN64)
   if (--map_count_ == 0)
     shm_.Unmap();
 #else
@@ -106,7 +106,7 @@ int32_t ImageData::GetSharedMemory(int* /* handle */,
 }
 
 skia::PlatformCanvas* ImageData::GetPlatformCanvas() {
-#if defined(OS_NACL)
+#if defined(OS_NACL) || defined(NACL_WIN64)
   return NULL;  // No canvas in NaCl.
 #else
   return mapped_canvas_.get();
@@ -114,14 +114,14 @@ skia::PlatformCanvas* ImageData::GetPlatformCanvas() {
 }
 
 SkCanvas* ImageData::GetCanvas() {
-#if defined(OS_NACL)
+#if defined(OS_NACL) || defined(NACL_WIN64)
   return NULL;  // No canvas in NaCl.
 #else
   return mapped_canvas_.get();
 #endif
 }
 
-#if !defined(OS_NACL)
+#if !defined(OS_NACL) && !defined(NACL_WIN64)
 // static
 ImageHandle ImageData::NullHandle() {
 #if defined(OS_WIN)
@@ -142,7 +142,7 @@ ImageHandle ImageData::HandleFromInt(int32_t i) {
     return static_cast<ImageHandle>(i);
 #endif
 }
-#endif  // !defined(OS_NACL)
+#endif  // !defined(OS_NACL) || !defined(NACL_WIN64)
 
 PPB_ImageData_Proxy::PPB_ImageData_Proxy(Dispatcher* dispatcher)
     : InterfaceProxy(dispatcher) {
@@ -162,11 +162,14 @@ PP_Resource PPB_ImageData_Proxy::CreateProxyResource(PP_Instance instance,
 
   HostResource result;
   std::string image_data_desc;
-#if defined(OS_NACL)
-  base::SharedMemoryHandle image_handle = base::SharedMemory::NULLHandle();
+#if defined(OS_NACL) || defined(NACL_WIN64)
+  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(
@@ -202,7 +205,7 @@ void PPB_ImageData_Proxy::OnHostMsgCreate(PP_Instance instance,
                                           HostResource* result,
                                           std::string* image_data_desc,
                                           ImageHandle* result_image_handle) {
-#if defined(OS_NACL)
+#if defined(OS_NACL) || defined(NACL_WIN64)
   // This message should never be received in untrusted code. To minimize the
   // size of the IRT, we just don't handle it.
   return;
@@ -239,7 +242,7 @@ void PPB_ImageData_Proxy::OnHostMsgCreate(PP_Instance instance,
     *result_image_handle = ImageData::HandleFromInt(handle);
 #endif  // defined(OS_WIN)
   }
-#endif  // defined(OS_NACL)
+#endif  // defined(OS_NACL) || defined(NACL_WIN64)
 }
 
 void PPB_ImageData_Proxy::OnHostMsgCreateNaCl(
@@ -249,13 +252,13 @@ void PPB_ImageData_Proxy::OnHostMsgCreateNaCl(
     PP_Bool init_to_zero,
     HostResource* result,
     std::string* image_data_desc,
-    base::SharedMemoryHandle* result_image_handle) {
-#if defined(OS_NACL)
+    ppapi::proxy::SerializedHandle* result_image_handle) {
+#if defined(OS_NACL) || defined(NACL_WIN64)
   // 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;
@@ -284,7 +287,6 @@ void PPB_ImageData_Proxy::OnHostMsgCreateNaCl(
   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 =
@@ -295,9 +297,10 @@ void PPB_ImageData_Proxy::OnHostMsgCreateNaCl(
 #else
   #error Not implemented.
 #endif  // defined(OS_WIN)
-  *result_image_handle =
-      dispatcher->ShareHandleWithRemote(platform_file, false);
-#endif  // defined(OS_NACL)
+  result_image_handle->set_shmem(
+      dispatcher->ShareHandleWithRemote(platform_file, false),
+      byte_count);
+#endif  // defined(OS_NACL) || defined(NACL_WIN64)
 }
 
 }  // namespace proxy