PPAPI/NaCl: Make NaClIPCAdapter transfer handles more generally

ppapi/proxy/ppb_image_data_proxy.h

 // 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.
 
 #ifndef PPAPI_PPB_IMAGE_DATA_PROXY_H_
 #define PPAPI_PPB_IMAGE_DATA_PROXY_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "build/build_config.h"
@@ skipping 15 matching lines @@
 
 namespace ppapi {
 namespace proxy {
 
 // The proxied image data resource. Unlike most resources, this needs to be
 // public in the header since a number of other resources need to access it.
 class ImageData : public ppapi::Resource,
                   public ppapi::thunk::PPB_ImageData_API,
                   public ppapi::PPB_ImageData_Shared {
  public:
-#if !defined(OS_NACL)
+#if !defined(OS_NACL) && !defined(NACL_WIN64)
   ImageData(const ppapi::HostResource& resource,
             const PP_ImageDataDesc& desc,
             ImageHandle handle);
 #else
   // In NaCl, we only allow creating an ImageData using a SharedMemoryHandle.
   // ImageHandle can differ by host platform. We need something that is
   // more consistent across platforms for NaCl, so that we can communicate to
   // the host OS in a consistent way.
   ImageData(const ppapi::HostResource& resource,
             const PP_ImageDataDesc& desc,
             const base::SharedMemoryHandle& handle);
 #endif
   virtual ~ImageData();
 
   // Resource overrides.
   virtual ppapi::thunk::PPB_ImageData_API* AsPPB_ImageData_API() OVERRIDE;
 
   // PPB_ImageData API.
   virtual PP_Bool Describe(PP_ImageDataDesc* desc) OVERRIDE;
   virtual void* Map() OVERRIDE;
   virtual void Unmap() OVERRIDE;
   virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) OVERRIDE;
   virtual skia::PlatformCanvas* GetPlatformCanvas() OVERRIDE;
   virtual SkCanvas* GetCanvas() OVERRIDE;
 
   const PP_ImageDataDesc& desc() const { return desc_; }
 
-#if !defined(OS_NACL)
+#if !defined(OS_NACL) && !defined(NACL_WIN64)
   static ImageHandle NullHandle();
   static ImageHandle HandleFromInt(int32_t i);
 #endif
 
  private:
   PP_ImageDataDesc desc_;
 
-#if defined(OS_NACL)
+#if defined(OS_NACL) || defined(NACL_WIN64)
   base::SharedMemory shm_;
   uint32 size_;
   int map_count_;
 #else
   scoped_ptr<TransportDIB> transport_dib_;
 
   // Null when the image isn't mapped.
   scoped_ptr<skia::PlatformCanvas> mapped_canvas_;
 #endif
 
@@ skipping 23 matching lines @@
                        PP_Bool init_to_zero,
                        HostResource* result,
                        std::string* image_data_desc,
                        ImageHandle* result_image_handle);
   void 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);
 
   DISALLOW_COPY_AND_ASSIGN(PPB_ImageData_Proxy);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PPB_IMAGE_DATA_PROXY_H_