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

Unified Diff: url/mojo/origin_struct_traits.h

Issue 1966933002: Mojo C++ bindings: switch the existing usage of StructTraits to use the new data view interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@26_reader
Patch Set: typeid() is not allowed :/ Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: url/mojo/origin_struct_traits.h
diff --git a/url/mojo/origin_struct_traits.h b/url/mojo/origin_struct_traits.h
index 1d28c877db9075b6a68813781c2206326ebe4e6d..1f7d63a479b34f1ad413008fbaebe59110b23a5e 100644
--- a/url/mojo/origin_struct_traits.h
+++ b/url/mojo/origin_struct_traits.h
@@ -25,15 +25,22 @@ struct StructTraits<url::mojom::Origin, url::Origin> {
static bool unique(const url::Origin& r) {
return r.unique();
}
- static bool Read(url::mojom::Origin::Reader r, url::Origin* out) {
- *out = r.unique() ? url::Origin()
- : url::Origin::UnsafelyCreateOriginWithoutNormalization(
- r.scheme(), r.host(), r.port());
+ static bool Read(url::mojom::OriginDataView data, url::Origin* out) {
+ if (data.unique()) {
+ *out = url::Origin();
+ } else {
+ base::StringPiece scheme, host;
+ if (!data.ReadScheme(&scheme) || !data.ReadHost(&host))
+ return false;
+
+ *out = url::Origin::UnsafelyCreateOriginWithoutNormalization(scheme, host,
+ data.port());
+ }
// If a unique origin was created, but the unique flag wasn't set, then
// the values provided to 'UnsafelyCreateOriginWithoutNormalization' were
// invalid.
- if (!r.unique() && out->unique())
+ if (!data.unique() && out->unique())
return false;
return true;

Powered by Google App Engine
This is Rietveld 408576698