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

Unified Diff: url/third_party/mozilla/url_parse.cc

Issue 23835019: Support URL fragment resolution againt non-hierarchical schemes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix net & webview tag tests Created 7 years, 2 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/third_party/mozilla/url_parse.cc
diff --git a/url/third_party/mozilla/url_parse.cc b/url/third_party/mozilla/url_parse.cc
index fbc8a9baf7a2fc97ef70a71cf58083d3c12e36ec..6e30580bc9978e8a088b89b1fc661150d9dd8e0a 100644
--- a/url/third_party/mozilla/url_parse.cc
+++ b/url/third_party/mozilla/url_parse.cc
@@ -462,6 +462,7 @@ void DoParsePathURL(const CHAR* spec, int spec_len, Parsed* parsed) {
parsed->password.reset();
parsed->host.reset();
parsed->port.reset();
+ parsed->path.reset();
parsed->query.reset();
parsed->ref.reset();
@@ -481,19 +482,20 @@ void DoParsePathURL(const CHAR* spec, int spec_len, Parsed* parsed) {
if (ExtractScheme(&spec[begin], spec_len - begin, &parsed->scheme)) {
// Offset the results since we gave ExtractScheme a substring.
parsed->scheme.begin += begin;
-
- // For compatability with the standard URL parser, we treat no path as
- // -1, rather than having a length of 0 (we normally wouldn't care so
- // much for these non-standard URLs).
- if (parsed->scheme.end() == spec_len - 1)
- parsed->path.reset();
- else
- parsed->path = MakeRange(parsed->scheme.end() + 1, spec_len);
+ begin = parsed->scheme.end() + 1;
} else {
- // No scheme found, just path.
parsed->scheme.reset();
- parsed->path = MakeRange(begin, spec_len);
}
+
+ if (begin == spec_len)
+ return;
+ DCHECK_LT(begin, spec_len);
+
+ ParsePath(spec,
+ MakeRange(begin, spec_len),
+ &parsed->path,
+ &parsed->query,
+ &parsed->ref);
}
template<typename CHAR>

Powered by Google App Engine
This is Rietveld 408576698