Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Side by Side Diff: ppapi/proxy/serialized_structs.h

Issue 23819033: Simplify PPB_NetworkMonitor proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix compilation after r169825 Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ppapi/proxy/resource_creation_proxy.cc ('k') | ppapi/proxy/serialized_structs.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/private/ppb_net_address_private.h"
20 #include "ppapi/c/private/ppb_network_list_private.h"
19 #include "ppapi/proxy/ppapi_proxy_export.h" 21 #include "ppapi/proxy/ppapi_proxy_export.h"
20 #include "ppapi/shared_impl/host_resource.h" 22 #include "ppapi/shared_impl/host_resource.h"
21 23
22 class Pickle; 24 class Pickle;
23 struct PP_FontDescription_Dev; 25 struct PP_FontDescription_Dev;
24 struct PP_BrowserFont_Trusted_Description; 26 struct PP_BrowserFont_Trusted_Description;
25 27
26 namespace ppapi { 28 namespace ppapi {
27 namespace proxy { 29 namespace proxy {
28 30
(...skipping 21 matching lines...) Expand all
50 std::string face; 52 std::string face;
51 int32_t family; 53 int32_t family;
52 uint32_t size; 54 uint32_t size;
53 int32_t weight; 55 int32_t weight;
54 PP_Bool italic; 56 PP_Bool italic;
55 PP_Bool small_caps; 57 PP_Bool small_caps;
56 int32_t letter_spacing; 58 int32_t letter_spacing;
57 int32_t word_spacing; 59 int32_t word_spacing;
58 }; 60 };
59 61
62 struct PPAPI_PROXY_EXPORT SerializedNetworkInfo {
63 SerializedNetworkInfo();
64 ~SerializedNetworkInfo();
65
66 std::string name;
67 PP_NetworkListType_Private type;
68 PP_NetworkListState_Private state;
69 std::vector<PP_NetAddress_Private> addresses;
70 std::string display_name;
71 int mtu;
72 };
73 typedef std::vector<SerializedNetworkInfo> SerializedNetworkList;
74
60 struct PPAPI_PROXY_EXPORT SerializedTrueTypeFontDesc { 75 struct PPAPI_PROXY_EXPORT SerializedTrueTypeFontDesc {
61 SerializedTrueTypeFontDesc(); 76 SerializedTrueTypeFontDesc();
62 ~SerializedTrueTypeFontDesc(); 77 ~SerializedTrueTypeFontDesc();
63 78
64 // Sets this to correspond to the contents of a PP_TrueTypeFontDesc_Dev. 79 // Sets this to correspond to the contents of a PP_TrueTypeFontDesc_Dev.
65 // 80 //
66 // The reference count of the desc.family PP_Var will be unchanged and the 81 // The reference count of the desc.family PP_Var will be unchanged and the
67 // caller is responsible for releasing it. 82 // caller is responsible for releasing it.
68 void SetFromPPTrueTypeFontDesc(const PP_TrueTypeFontDesc_Dev& desc); 83 void SetFromPPTrueTypeFontDesc(const PP_TrueTypeFontDesc_Dev& desc);
69 84
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 // On legacy X Windows this is a SysV shared memory key. 139 // On legacy X Windows this is a SysV shared memory key.
125 typedef int ImageHandle; 140 typedef int ImageHandle;
126 #else 141 #else
127 typedef base::SharedMemoryHandle ImageHandle; 142 typedef base::SharedMemoryHandle ImageHandle;
128 #endif 143 #endif
129 144
130 } // namespace proxy 145 } // namespace proxy
131 } // namespace ppapi 146 } // namespace ppapi
132 147
133 #endif // PPAPI_PROXY_SERIALIZED_STRUCTS_H_ 148 #endif // PPAPI_PROXY_SERIALIZED_STRUCTS_H_
OLDNEW
« no previous file with comments | « ppapi/proxy/resource_creation_proxy.cc ('k') | ppapi/proxy/serialized_structs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698