Index: url/third_party/mozilla/url_parse.h |
diff --git a/url/third_party/mozilla/url_parse.h b/url/third_party/mozilla/url_parse.h |
index fd974f8863b079dd0d8abad325aca72a5ceab500..25612ea911ae84ad2ba31c67cfd885011d1e56b8 100644 |
--- a/url/third_party/mozilla/url_parse.h |
+++ b/url/third_party/mozilla/url_parse.h |
@@ -159,10 +159,11 @@ struct URL_EXPORT Parsed { |
// Port number. |
Component port; |
- // Path, this is everything following the host name. Length will be -1 if |
- // unspecified. This includes the preceeding slash, so the path on |
- // http://www.google.com/asdf" is "/asdf". As a result, it is impossible to |
- // have a 0 length path, it will be -1 in cases like "http://host?foo". |
+ // Path, this is everything following the host name, stopping at the query of |
+ // ref delimiter (if any). Length will be -1 if unspecified. This includes |
+ // the preceeding slash, so the path on http://www.google.com/asdf" is |
+ // "/asdf". As a result, it is impossible to have a 0 length path, it will |
+ // be -1 in cases like "http://host?foo". |
// Note that we treat backslashes the same as slashes. |
Component path; |
@@ -177,6 +178,12 @@ struct URL_EXPORT Parsed { |
// nothing follows it. |
Component ref; |
+ // The URL spec from the character after the scheme: until the end of the |
+ // URL, regardless of the scheme. This is mostly useful for 'opaque' non- |
+ // hierarchical schemes like data: and javascript: as a convient way to get |
+ // the string with the scheme stripped off. |
+ Component Content() const; |
+ |
// This is used for nested URL types, currently only filesystem. If you |
// parse a filesystem URL, the resulting Parsed will have a nested |
// inner_parsed_ to hold the parsed inner URL's component information. |
@@ -231,10 +238,12 @@ URL_EXPORT void ParseStandardURL(const base::char16* url, |
// section but that aren't file URLs either. The scheme is parsed, and |
// everything after the scheme is considered as the path. This is used for |
// things like "about:" and "javascript:" |
-URL_EXPORT void ParsePathURL(const char* url, int url_len, Parsed* parsed); |
+URL_EXPORT void ParsePathURL(const char* url, int url_len, Parsed* parsed, |
+ bool trim_tail = true); |
URL_EXPORT void ParsePathURL(const base::char16* url, |
int url_len, |
- Parsed* parsed); |
+ Parsed* parsed, |
+ bool trim_tail = true); |
// FileURL is for file URLs. There are some special rules for interpreting |
// these. |