| Index: ppapi/proxy/ppapi_param_traits.h
|
| diff --git a/ppapi/proxy/ppapi_param_traits.h b/ppapi/proxy/ppapi_param_traits.h
|
| index 5b12f60682e484a439754cdf7b2a81afe2e61405..399513c54ab6e11b2b888ba97534599f98e52e48 100644
|
| --- a/ppapi/proxy/ppapi_param_traits.h
|
| +++ b/ppapi/proxy/ppapi_param_traits.h
|
| @@ -32,6 +32,7 @@ struct PPBURLLoader_UpdateProgress_Params;
|
| struct SerializedDirEntry;
|
| struct SerializedFontDescription;
|
| class SerializedFlashMenu;
|
| +class SerializedHandle;
|
| class SerializedVar;
|
|
|
| } // namespace proxy
|
| @@ -114,6 +115,14 @@ struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::proxy::SerializedFontDescription> {
|
| };
|
|
|
| template<>
|
| +struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::proxy::SerializedHandle> {
|
| + typedef ppapi::proxy::SerializedHandle param_type;
|
| + static void Write(Message* m, const param_type& p);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| + static void Log(const param_type& p, std::string* l);
|
| +};
|
| +
|
| +template<>
|
| struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::HostResource> {
|
| typedef ppapi::HostResource param_type;
|
| static void Write(Message* m, const param_type& p);
|
| @@ -147,7 +156,7 @@ struct PPAPI_PROXY_EXPORT ParamTraits< std::vector<
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| -#if !defined(OS_NACL)
|
| +#if !defined(OS_NACL) && !defined(NACL_WIN64)
|
| template<>
|
| struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::proxy::SerializedFlashMenu> {
|
| typedef ppapi::proxy::SerializedFlashMenu param_type;
|
| @@ -163,7 +172,8 @@ struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::PPB_X509Certificate_Fields> {
|
| static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
| -#endif // !defined(OS_NACL)
|
| +#endif // !defined(OS_NACL) && !defined(NACL_WIN64)
|
| +
|
|
|
| } // namespace IPC
|
|
|
|
|