| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef PPAPI_PROXY_PPAPI_PARAM_TRAITS_H_ | 5 #ifndef PPAPI_PROXY_PPAPI_PARAM_TRAITS_H_ |
| 6 #define PPAPI_PROXY_PPAPI_PARAM_TRAITS_H_ | 6 #define PPAPI_PROXY_PPAPI_PARAM_TRAITS_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "ipc/ipc_message_utils.h" | 11 #include "ipc/ipc_message_utils.h" |
| 12 #include "ipc/ipc_platform_file.h" | 12 #include "ipc/ipc_platform_file.h" |
| 13 #include "ppapi/c/pp_completion_callback.h" | 13 #include "ppapi/c/pp_completion_callback.h" |
| 14 #include "ppapi/c/pp_rect.h" | 14 #include "ppapi/c/pp_rect.h" |
| 15 #include "ppapi/c/pp_var.h" | 15 #include "ppapi/c/pp_var.h" |
| 16 #include "ppapi/proxy/ppapi_proxy_export.h" | 16 #include "ppapi/proxy/ppapi_proxy_export.h" |
| 17 #include "ppapi/shared_impl/file_path.h" | 17 #include "ppapi/shared_impl/file_path.h" |
| 18 #include "ppapi/shared_impl/file_ref_create_info.h" | 18 #include "ppapi/shared_impl/file_ref_create_info.h" |
| 19 #include "ppapi/shared_impl/ppapi_permissions.h" | 19 #include "ppapi/shared_impl/ppapi_permissions.h" |
| 20 #include "ppapi/shared_impl/ppb_file_ref_shared.h" | |
| 21 #include "ppapi/shared_impl/socket_option_data.h" | 20 #include "ppapi/shared_impl/socket_option_data.h" |
| 22 | 21 |
| 23 struct PP_FileInfo; | 22 struct PP_FileInfo; |
| 24 struct PP_NetAddress_Private; | 23 struct PP_NetAddress_Private; |
| 25 | 24 |
| 26 namespace ppapi { | 25 namespace ppapi { |
| 27 | 26 |
| 28 class HostResource; | 27 class HostResource; |
| 29 class PPB_X509Certificate_Fields; | 28 class PPB_X509Certificate_Fields; |
| 30 | 29 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 | 69 |
| 71 template<> | 70 template<> |
| 72 struct PPAPI_PROXY_EXPORT ParamTraits< | 71 struct PPAPI_PROXY_EXPORT ParamTraits< |
| 73 ppapi::proxy::PPBFlash_DrawGlyphs_Params> { | 72 ppapi::proxy::PPBFlash_DrawGlyphs_Params> { |
| 74 typedef ppapi::proxy::PPBFlash_DrawGlyphs_Params param_type; | 73 typedef ppapi::proxy::PPBFlash_DrawGlyphs_Params param_type; |
| 75 static void Write(Message* m, const param_type& p); | 74 static void Write(Message* m, const param_type& p); |
| 76 static bool Read(const Message* m, PickleIterator* iter, param_type* r); | 75 static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
| 77 static void Log(const param_type& p, std::string* l); | 76 static void Log(const param_type& p, std::string* l); |
| 78 }; | 77 }; |
| 79 | 78 |
| 80 // TODO(teravest): Remove this when we've switched over to the new proxy. | |
| 81 template<> | |
| 82 struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::PPB_FileRef_CreateInfo> { | |
| 83 typedef ppapi::PPB_FileRef_CreateInfo param_type; | |
| 84 static void Write(Message* m, const param_type& p); | |
| 85 static bool Read(const Message* m, PickleIterator* iter, param_type* r); | |
| 86 static void Log(const param_type& p, std::string* l); | |
| 87 }; | |
| 88 | |
| 89 template<> | 79 template<> |
| 90 struct PPAPI_PROXY_EXPORT ParamTraits< | 80 struct PPAPI_PROXY_EXPORT ParamTraits< |
| 91 ppapi::proxy::PPBURLLoader_UpdateProgress_Params> { | 81 ppapi::proxy::PPBURLLoader_UpdateProgress_Params> { |
| 92 typedef ppapi::proxy::PPBURLLoader_UpdateProgress_Params param_type; | 82 typedef ppapi::proxy::PPBURLLoader_UpdateProgress_Params param_type; |
| 93 static void Write(Message* m, const param_type& p); | 83 static void Write(Message* m, const param_type& p); |
| 94 static bool Read(const Message* m, PickleIterator* iter, param_type* r); | 84 static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
| 95 static void Log(const param_type& p, std::string* l); | 85 static void Log(const param_type& p, std::string* l); |
| 96 }; | 86 }; |
| 97 | 87 |
| 98 template<> | 88 template<> |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 template<> | 137 template<> |
| 148 struct PPAPI_PROXY_EXPORT ParamTraits< | 138 struct PPAPI_PROXY_EXPORT ParamTraits< |
| 149 std::vector<ppapi::proxy::SerializedVar> > { | 139 std::vector<ppapi::proxy::SerializedVar> > { |
| 150 typedef std::vector<ppapi::proxy::SerializedVar> param_type; | 140 typedef std::vector<ppapi::proxy::SerializedVar> param_type; |
| 151 static void Write(Message* m, const param_type& p); | 141 static void Write(Message* m, const param_type& p); |
| 152 static bool Read(const Message* m, PickleIterator* iter, param_type* r); | 142 static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
| 153 static void Log(const param_type& p, std::string* l); | 143 static void Log(const param_type& p, std::string* l); |
| 154 }; | 144 }; |
| 155 | 145 |
| 156 template<> | 146 template<> |
| 157 struct PPAPI_PROXY_EXPORT ParamTraits< std::vector< | |
| 158 ppapi::PPB_FileRef_CreateInfo> > { | |
| 159 typedef std::vector<ppapi::PPB_FileRef_CreateInfo> param_type; | |
| 160 static void Write(Message* m, const param_type& p); | |
| 161 static bool Read(const Message* m, PickleIterator* iter, param_type* r); | |
| 162 static void Log(const param_type& p, std::string* l); | |
| 163 }; | |
| 164 | |
| 165 template<> | |
| 166 struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::PpapiPermissions> { | 147 struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::PpapiPermissions> { |
| 167 typedef ppapi::PpapiPermissions param_type; | 148 typedef ppapi::PpapiPermissions param_type; |
| 168 static void Write(Message* m, const param_type& p); | 149 static void Write(Message* m, const param_type& p); |
| 169 static bool Read(const Message* m, PickleIterator* iter, param_type* r); | 150 static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
| 170 static void Log(const param_type& p, std::string* l); | 151 static void Log(const param_type& p, std::string* l); |
| 171 }; | 152 }; |
| 172 | 153 |
| 173 #if !defined(OS_NACL) && !defined(NACL_WIN64) | 154 #if !defined(OS_NACL) && !defined(NACL_WIN64) |
| 174 template <> | 155 template <> |
| 175 struct ParamTraits<ppapi::PepperFilePath> { | 156 struct ParamTraits<ppapi::PepperFilePath> { |
| (...skipping 24 matching lines...) Expand all Loading... |
| 200 struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::SocketOptionData> { | 181 struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::SocketOptionData> { |
| 201 typedef ppapi::SocketOptionData param_type; | 182 typedef ppapi::SocketOptionData param_type; |
| 202 static void Write(Message* m, const param_type& p); | 183 static void Write(Message* m, const param_type& p); |
| 203 static bool Read(const Message* m, PickleIterator* iter, param_type* r); | 184 static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
| 204 static void Log(const param_type& p, std::string* l); | 185 static void Log(const param_type& p, std::string* l); |
| 205 }; | 186 }; |
| 206 | 187 |
| 207 } // namespace IPC | 188 } // namespace IPC |
| 208 | 189 |
| 209 #endif // PPAPI_PROXY_PPAPI_PARAM_TRAITS_H_ | 190 #endif // PPAPI_PROXY_PPAPI_PARAM_TRAITS_H_ |
| OLD | NEW |