diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-17 13:57:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-19 13:44:40 +0000 |
| commit | 6ec7b8da05d21a3878bd21c691b41e675d74bb1c (patch) | |
| tree | b87f250bc19413750b9bb9cdbf2da20ef5014820 /chromium/url/origin.cc | |
| parent | ec02ee4181c49b61fce1c8fb99292dbb8139cc90 (diff) | |
| download | qtwebengine-chromium-6ec7b8da05d21a3878bd21c691b41e675d74bb1c.tar.gz | |
BASELINE: Update Chromium to 60.0.3112.70
Change-Id: I9911c2280a014d4632f254857876a395d4baed2d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/url/origin.cc')
| -rw-r--r-- | chromium/url/origin.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chromium/url/origin.cc b/chromium/url/origin.cc index 53600b1dc96..d15ba43f8f6 100644 --- a/chromium/url/origin.cc +++ b/chromium/url/origin.cc @@ -107,8 +107,10 @@ Origin::~Origin() { Origin Origin::UnsafelyCreateOriginWithoutNormalization( base::StringPiece scheme, base::StringPiece host, - uint16_t port) { - return Origin(scheme, host, port, "", SchemeHostPort::CHECK_CANONICALIZATION); + uint16_t port, + base::StringPiece suborigin) { + return Origin(scheme, host, port, suborigin, + SchemeHostPort::CHECK_CANONICALIZATION); } Origin Origin::CreateFromNormalizedTupleWithSuborigin( @@ -173,7 +175,8 @@ bool Origin::DomainIs(base::StringPiece lower_ascii_domain) const { } bool Origin::operator<(const Origin& other) const { - return tuple_ < other.tuple_; + return tuple_ < other.tuple_ || + (tuple_.Equals(other.tuple_) && suborigin_ < other.suborigin_); } std::ostream& operator<<(std::ostream& out, const url::Origin& origin) { |