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

Unified Diff: content/public/common/common_param_traits.cc

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 side-by-side diff with in-line comments
Download patch
Index: content/public/common/common_param_traits.cc
diff --git a/content/public/common/common_param_traits.cc b/content/public/common/common_param_traits.cc
index 3fcfdda02de585798129621632ded831b39508b0..9edfe365c3b8b577528a58e424791bbbe11d4f4f 100644
--- a/content/public/common/common_param_traits.cc
+++ b/content/public/common/common_param_traits.cc
@@ -17,14 +17,14 @@ namespace IPC {
void ParamTraits<url::Origin>::GetSize(base::PickleSizer* s,
const param_type& p) {
- GetParamSize(s, p.unique());
+ GetParamSize(s, p.opaque());
GetParamSize(s, p.scheme());
GetParamSize(s, p.host());
GetParamSize(s, p.port());
}
void ParamTraits<url::Origin>::Write(base::Pickle* m, const url::Origin& p) {
- WriteParam(m, p.unique());
+ WriteParam(m, p.opaque());
WriteParam(m, p.scheme());
WriteParam(m, p.host());
WriteParam(m, p.port());
@@ -33,24 +33,24 @@ void ParamTraits<url::Origin>::Write(base::Pickle* m, const url::Origin& p) {
bool ParamTraits<url::Origin>::Read(const base::Pickle* m,
base::PickleIterator* iter,
url::Origin* p) {
- bool unique;
+ bool opaque;
std::string scheme;
std::string host;
uint16_t port;
- if (!ReadParam(m, iter, &unique) || !ReadParam(m, iter, &scheme) ||
+ if (!ReadParam(m, iter, &opaque) || !ReadParam(m, iter, &scheme) ||
!ReadParam(m, iter, &host) || !ReadParam(m, iter, &port)) {
*p = url::Origin();
return false;
}
- *p = unique ? url::Origin()
+ *p = opaque ? url::Origin()
: url::Origin::UnsafelyCreateOriginWithoutNormalization(
scheme, host, port);
- // If a unique origin was created, but the unique flag wasn't set, then
+ // If an opaque origin was created, but the opaque flag wasn't set, then
// the values provided to 'UnsafelyCreateOriginWithoutNormalization' were
// invalid; kill the renderer.
- if (!unique && p->unique())
+ if (!opaque && p->opaque())
return false;
return true;

Powered by Google App Engine
This is Rietveld 408576698