OLD | NEW |
1 // Copyright 2007, Google Inc. | 1 // Copyright 2007, Google Inc. |
2 // All rights reserved. | 2 // All rights reserved. |
3 // | 3 // |
4 // Redistribution and use in source and binary forms, with or without | 4 // Redistribution and use in source and binary forms, with or without |
5 // modification, are permitted provided that the following conditions are | 5 // modification, are permitted provided that the following conditions are |
6 // met: | 6 // met: |
7 // | 7 // |
8 // * Redistributions of source code must retain the above copyright | 8 // * Redistributions of source code must retain the above copyright |
9 // notice, this list of conditions and the following disclaimer. | 9 // notice, this list of conditions and the following disclaimer. |
10 // * Redistributions in binary form must reproduce the above | 10 // * Redistributions in binary form must reproduce the above |
(...skipping 13 matching lines...) Expand all Loading... |
24 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 | 29 |
30 // Functions for canonicalizing "path" URLs. Not to be confused with the path | 30 // Functions for canonicalizing "path" URLs. Not to be confused with the path |
31 // of a URL, these are URLs that have no authority section, only a path. For | 31 // of a URL, these are URLs that have no authority section, only a path. For |
32 // example, "javascript:" and "data:". | 32 // example, "javascript:" and "data:". |
33 | 33 |
34 #include "googleurl/src/url_canon.h" | 34 #include "url/url_canon.h" |
35 #include "googleurl/src/url_canon_internal.h" | 35 #include "url/url_canon_internal.h" |
36 | 36 |
37 namespace url_canon { | 37 namespace url_canon { |
38 | 38 |
39 namespace { | 39 namespace { |
40 | 40 |
41 template<typename CHAR, typename UCHAR> | 41 template<typename CHAR, typename UCHAR> |
42 bool DoCanonicalizePathURL(const URLComponentSource<CHAR>& source, | 42 bool DoCanonicalizePathURL(const URLComponentSource<CHAR>& source, |
43 const url_parse::Parsed& parsed, | 43 const url_parse::Parsed& parsed, |
44 CanonOutput* output, | 44 CanonOutput* output, |
45 url_parse::Parsed* new_parsed) { | 45 url_parse::Parsed* new_parsed) { |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 url_parse::Parsed* new_parsed) { | 119 url_parse::Parsed* new_parsed) { |
120 RawCanonOutput<1024> utf8; | 120 RawCanonOutput<1024> utf8; |
121 URLComponentSource<char> source(base); | 121 URLComponentSource<char> source(base); |
122 url_parse::Parsed parsed(base_parsed); | 122 url_parse::Parsed parsed(base_parsed); |
123 SetupUTF16OverrideComponents(base, replacements, &utf8, &source, &parsed); | 123 SetupUTF16OverrideComponents(base, replacements, &utf8, &source, &parsed); |
124 return DoCanonicalizePathURL<char, unsigned char>( | 124 return DoCanonicalizePathURL<char, unsigned char>( |
125 source, parsed, output, new_parsed); | 125 source, parsed, output, new_parsed); |
126 } | 126 } |
127 | 127 |
128 } // namespace url_canon | 128 } // namespace url_canon |
OLD | NEW |