Chromium Code Reviews| Index: url/origin.cc |
| diff --git a/url/origin.cc b/url/origin.cc |
| index f31d38ababa08e57e89ec9a219f7a2676e9e80a3..e97c6fdb26ffc20abd7bea8c0df4d00000643fec 100644 |
| --- a/url/origin.cc |
| +++ b/url/origin.cc |
| @@ -39,8 +39,11 @@ Origin::Origin(const GURL& url) : unique_(true) { |
| unique_ = tuple_.IsInvalid(); |
| } |
| -Origin::Origin(base::StringPiece scheme, base::StringPiece host, uint16_t port) |
| - : tuple_(scheme, host, port) { |
| +Origin::Origin(base::StringPiece scheme, |
| + base::StringPiece host, |
| + uint16_t port, |
| + bool is_canonicalized) |
| + : tuple_(scheme, host, port, is_canonicalized) { |
| unique_ = tuple_.IsInvalid(); |
| } |
| @@ -52,7 +55,13 @@ Origin Origin::UnsafelyCreateOriginWithoutNormalization( |
| base::StringPiece scheme, |
| base::StringPiece host, |
| uint16_t port) { |
| - return Origin(scheme, host, port); |
| + return Origin(scheme, host, port, false /* is_canonicalized */); |
| +} |
| + |
| +Origin Origin::CreateFromNormalizedTuple(base::StringPiece scheme, |
| + base::StringPiece host, |
| + uint16_t port) { |
| + return Origin(scheme, host, port, true /* is_canonicalized */); |
|
Mike West
2016/10/11 08:38:33
Nit: Did you consider making this an enum rather t
Charlie Harrison
2016/10/11 16:29:55
Done.
|
| } |
| std::string Origin::Serialize() const { |