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 #include "content/public/common/common_param_traits.h" | 5 #include "content/public/common/common_param_traits.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/containers/stack_container.h" | 9 #include "base/containers/stack_container.h" |
10 #include "content/public/common/content_constants.h" | 10 #include "content/public/common/content_constants.h" |
11 #include "content/public/common/page_state.h" | 11 #include "content/public/common/page_state.h" |
12 #include "content/public/common/referrer.h" | 12 #include "content/public/common/referrer.h" |
13 #include "net/base/host_port_pair.h" | 13 #include "net/base/host_port_pair.h" |
14 #include "net/base/ip_address.h" | 14 #include "net/base/ip_address.h" |
15 #include "net/base/ip_endpoint.h" | 15 #include "net/base/ip_endpoint.h" |
16 | 16 |
17 namespace IPC { | 17 namespace IPC { |
18 | 18 |
19 void ParamTraits<url::Origin>::GetSize(base::PickleSizer* s, | 19 void ParamTraits<url::Origin>::GetSize(base::PickleSizer* s, |
20 const param_type& p) { | 20 const param_type& p) { |
21 GetParamSize(s, p.unique()); | 21 GetParamSize(s, p.opaque()); |
22 GetParamSize(s, p.scheme()); | 22 GetParamSize(s, p.scheme()); |
23 GetParamSize(s, p.host()); | 23 GetParamSize(s, p.host()); |
24 GetParamSize(s, p.port()); | 24 GetParamSize(s, p.port()); |
25 GetParamSize(s, p.suborigin()); | 25 GetParamSize(s, p.suborigin()); |
26 } | 26 } |
27 | 27 |
28 void ParamTraits<url::Origin>::Write(base::Pickle* m, const url::Origin& p) { | 28 void ParamTraits<url::Origin>::Write(base::Pickle* m, const url::Origin& p) { |
29 WriteParam(m, p.unique()); | 29 WriteParam(m, p.opaque()); |
30 WriteParam(m, p.scheme()); | 30 WriteParam(m, p.scheme()); |
31 WriteParam(m, p.host()); | 31 WriteParam(m, p.host()); |
32 WriteParam(m, p.port()); | 32 WriteParam(m, p.port()); |
33 WriteParam(m, p.suborigin()); | 33 WriteParam(m, p.suborigin()); |
34 } | 34 } |
35 | 35 |
36 bool ParamTraits<url::Origin>::Read(const base::Pickle* m, | 36 bool ParamTraits<url::Origin>::Read(const base::Pickle* m, |
37 base::PickleIterator* iter, | 37 base::PickleIterator* iter, |
38 url::Origin* p) { | 38 url::Origin* p) { |
39 bool unique; | 39 bool opaque; |
40 std::string scheme; | 40 std::string scheme; |
41 std::string host; | 41 std::string host; |
42 uint16_t port; | 42 uint16_t port; |
43 std::string suborigin; | 43 std::string suborigin; |
44 if (!ReadParam(m, iter, &unique) || !ReadParam(m, iter, &scheme) || | 44 if (!ReadParam(m, iter, &opaque) || !ReadParam(m, iter, &scheme) || |
45 !ReadParam(m, iter, &host) || !ReadParam(m, iter, &port) || | 45 !ReadParam(m, iter, &host) || !ReadParam(m, iter, &port) || |
46 !ReadParam(m, iter, &suborigin)) { | 46 !ReadParam(m, iter, &suborigin)) { |
47 *p = url::Origin(); | 47 *p = url::Origin(); |
48 return false; | 48 return false; |
49 } | 49 } |
50 | 50 |
51 *p = unique ? url::Origin() | 51 *p = opaque ? url::Origin() |
52 : url::Origin::UnsafelyCreateOriginWithoutNormalization( | 52 : url::Origin::UnsafelyCreateOriginWithoutNormalization( |
53 scheme, host, port, suborigin); | 53 scheme, host, port, suborigin); |
54 | 54 |
55 // If a unique origin was created, but the unique flag wasn't set, then | 55 // If an opaque origin was created, but the opaque flag wasn't set, then |
56 // the values provided to 'UnsafelyCreateOriginWithoutNormalization' were | 56 // the values provided to 'UnsafelyCreateOriginWithoutNormalization' were |
57 // invalid; kill the renderer. | 57 // invalid; kill the renderer. |
58 if (!unique && p->unique()) | 58 if (!opaque && p->opaque()) |
59 return false; | 59 return false; |
60 | 60 |
61 return true; | 61 return true; |
62 } | 62 } |
63 | 63 |
64 void ParamTraits<url::Origin>::Log(const url::Origin& p, std::string* l) { | 64 void ParamTraits<url::Origin>::Log(const url::Origin& p, std::string* l) { |
65 l->append(p.Serialize()); | 65 l->append(p.Serialize()); |
66 } | 66 } |
67 | 67 |
68 void ParamTraits<net::HostPortPair>::GetSize(base::PickleSizer* s, | 68 void ParamTraits<net::HostPortPair>::GetSize(base::PickleSizer* s, |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 #undef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ | 205 #undef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ |
206 #include "content/public/common/common_param_traits_macros.h" | 206 #include "content/public/common/common_param_traits_macros.h" |
207 } // namespace IPC | 207 } // namespace IPC |
208 | 208 |
209 // Generate param traits log methods. | 209 // Generate param traits log methods. |
210 #include "ipc/param_traits_log_macros.h" | 210 #include "ipc/param_traits_log_macros.h" |
211 namespace IPC { | 211 namespace IPC { |
212 #undef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ | 212 #undef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ |
213 #include "content/public/common/common_param_traits_macros.h" | 213 #include "content/public/common/common_param_traits_macros.h" |
214 } // namespace IPC | 214 } // namespace IPC |
OLD | NEW |