| 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_SERIALIZED_STRUCTS_H_ | 5 #ifndef PPAPI_PROXY_SERIALIZED_STRUCTS_H_ |
| 6 #define PPAPI_PROXY_SERIALIZED_STRUCTS_H_ | 6 #define PPAPI_PROXY_SERIALIZED_STRUCTS_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/memory/shared_memory.h" | 12 #include "base/memory/shared_memory.h" |
| 13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
| 14 #include "ppapi/c/dev/ppb_truetype_font_dev.h" | 14 #include "ppapi/c/dev/ppb_truetype_font_dev.h" |
| 15 #include "ppapi/c/pp_bool.h" | 15 #include "ppapi/c/pp_bool.h" |
| 16 #include "ppapi/c/pp_instance.h" | 16 #include "ppapi/c/pp_instance.h" |
| 17 #include "ppapi/c/pp_point.h" | 17 #include "ppapi/c/pp_point.h" |
| 18 #include "ppapi/c/pp_rect.h" | 18 #include "ppapi/c/pp_rect.h" |
| 19 #include "ppapi/c/ppb_network_list.h" |
| 19 #include "ppapi/c/private/ppb_net_address_private.h" | 20 #include "ppapi/c/private/ppb_net_address_private.h" |
| 20 #include "ppapi/c/private/ppb_network_list_private.h" | |
| 21 #include "ppapi/proxy/ppapi_proxy_export.h" | 21 #include "ppapi/proxy/ppapi_proxy_export.h" |
| 22 #include "ppapi/shared_impl/host_resource.h" | 22 #include "ppapi/shared_impl/host_resource.h" |
| 23 | 23 |
| 24 class Pickle; | 24 class Pickle; |
| 25 struct PP_FontDescription_Dev; | 25 struct PP_FontDescription_Dev; |
| 26 struct PP_BrowserFont_Trusted_Description; | 26 struct PP_BrowserFont_Trusted_Description; |
| 27 | 27 |
| 28 namespace ppapi { | 28 namespace ppapi { |
| 29 namespace proxy { | 29 namespace proxy { |
| 30 | 30 |
| (...skipping 26 matching lines...) Expand all Loading... |
| 57 PP_Bool small_caps; | 57 PP_Bool small_caps; |
| 58 int32_t letter_spacing; | 58 int32_t letter_spacing; |
| 59 int32_t word_spacing; | 59 int32_t word_spacing; |
| 60 }; | 60 }; |
| 61 | 61 |
| 62 struct PPAPI_PROXY_EXPORT SerializedNetworkInfo { | 62 struct PPAPI_PROXY_EXPORT SerializedNetworkInfo { |
| 63 SerializedNetworkInfo(); | 63 SerializedNetworkInfo(); |
| 64 ~SerializedNetworkInfo(); | 64 ~SerializedNetworkInfo(); |
| 65 | 65 |
| 66 std::string name; | 66 std::string name; |
| 67 PP_NetworkListType_Private type; | 67 PP_NetworkList_Type type; |
| 68 PP_NetworkListState_Private state; | 68 PP_NetworkList_State state; |
| 69 std::vector<PP_NetAddress_Private> addresses; | 69 std::vector<PP_NetAddress_Private> addresses; |
| 70 std::string display_name; | 70 std::string display_name; |
| 71 int mtu; | 71 int mtu; |
| 72 }; | 72 }; |
| 73 typedef std::vector<SerializedNetworkInfo> SerializedNetworkList; | 73 typedef std::vector<SerializedNetworkInfo> SerializedNetworkList; |
| 74 | 74 |
| 75 struct PPAPI_PROXY_EXPORT SerializedTrueTypeFontDesc { | 75 struct PPAPI_PROXY_EXPORT SerializedTrueTypeFontDesc { |
| 76 SerializedTrueTypeFontDesc(); | 76 SerializedTrueTypeFontDesc(); |
| 77 ~SerializedTrueTypeFontDesc(); | 77 ~SerializedTrueTypeFontDesc(); |
| 78 | 78 |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 // On legacy X Windows this is a SysV shared memory key. | 139 // On legacy X Windows this is a SysV shared memory key. |
| 140 typedef int ImageHandle; | 140 typedef int ImageHandle; |
| 141 #else | 141 #else |
| 142 typedef base::SharedMemoryHandle ImageHandle; | 142 typedef base::SharedMemoryHandle ImageHandle; |
| 143 #endif | 143 #endif |
| 144 | 144 |
| 145 } // namespace proxy | 145 } // namespace proxy |
| 146 } // namespace ppapi | 146 } // namespace ppapi |
| 147 | 147 |
| 148 #endif // PPAPI_PROXY_SERIALIZED_STRUCTS_H_ | 148 #endif // PPAPI_PROXY_SERIALIZED_STRUCTS_H_ |
| OLD | NEW |