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

Side by Side Diff: url/mojo/origin_struct_traits.h

Issue 2716583003: Rename Origin.unique() to opaque().
Patch Set: Mac fixes Created 3 years, 10 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 URL_MOJO_ORIGIN_STRUCT_TRAITS_H_ 5 #ifndef URL_MOJO_ORIGIN_STRUCT_TRAITS_H_
6 #define URL_MOJO_ORIGIN_STRUCT_TRAITS_H_ 6 #define URL_MOJO_ORIGIN_STRUCT_TRAITS_H_
7 7
8 #include "base/strings/string_piece.h" 8 #include "base/strings/string_piece.h"
9 #include "url/mojo/origin.mojom.h" 9 #include "url/mojo/origin.mojom.h"
10 #include "url/origin.h" 10 #include "url/origin.h"
11 11
12 namespace mojo { 12 namespace mojo {
13 13
14 template <> 14 template <>
15 struct StructTraits<url::mojom::OriginDataView, url::Origin> { 15 struct StructTraits<url::mojom::OriginDataView, url::Origin> {
16 static const std::string& scheme(const url::Origin& r) { return r.scheme(); } 16 static const std::string& scheme(const url::Origin& r) { return r.scheme(); }
17 static const std::string& host(const url::Origin& r) { return r.host(); } 17 static const std::string& host(const url::Origin& r) { return r.host(); }
18 static uint16_t port(const url::Origin& r) { 18 static uint16_t port(const url::Origin& r) {
19 return r.port(); 19 return r.port();
20 } 20 }
21 static bool unique(const url::Origin& r) { 21 static bool opaque(const url::Origin& r) { return r.opaque(); }
22 return r.unique();
23 }
24 static bool Read(url::mojom::OriginDataView data, url::Origin* out) { 22 static bool Read(url::mojom::OriginDataView data, url::Origin* out) {
25 if (data.unique()) { 23 if (data.opaque()) {
26 *out = url::Origin(); 24 *out = url::Origin();
27 } else { 25 } else {
28 base::StringPiece scheme, host; 26 base::StringPiece scheme, host;
29 if (!data.ReadScheme(&scheme) || !data.ReadHost(&host)) 27 if (!data.ReadScheme(&scheme) || !data.ReadHost(&host))
30 return false; 28 return false;
31 29
32 *out = url::Origin::UnsafelyCreateOriginWithoutNormalization(scheme, host, 30 *out = url::Origin::UnsafelyCreateOriginWithoutNormalization(scheme, host,
33 data.port()); 31 data.port());
34 } 32 }
35 33
36 // If a unique origin was created, but the unique flag wasn't set, then 34 // If an opaque origin was created, but the opaque flag wasn't set, then
37 // the values provided to 'UnsafelyCreateOriginWithoutNormalization' were 35 // the values provided to 'UnsafelyCreateOriginWithoutNormalization' were
38 // invalid. 36 // invalid.
39 if (!data.unique() && out->unique()) 37 if (!data.opaque() && out->opaque())
40 return false; 38 return false;
41 39
42 return true; 40 return true;
43 } 41 }
44 }; 42 };
45 43
46 } 44 }
47 45
48 #endif // URL_MOJO_ORIGIN_STRUCT_TRAITS_H_ 46 #endif // URL_MOJO_ORIGIN_STRUCT_TRAITS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698