OLD | NEW |
1 // Copyright 2012, Google Inc. | 1 // Copyright 2012, 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 11 matching lines...) Expand all Loading... |
22 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
23 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
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 "filesystem:file:" URLs. | 30 // Functions for canonicalizing "filesystem:file:" URLs. |
31 | 31 |
32 #include "googleurl/src/url_canon.h" | 32 #include "url/url_canon.h" |
33 #include "googleurl/src/url_canon_internal.h" | 33 #include "url/url_canon_internal.h" |
34 #include "googleurl/src/url_file.h" | 34 #include "url/url_file.h" |
35 #include "googleurl/src/url_parse_internal.h" | 35 #include "url/url_parse_internal.h" |
36 #include "googleurl/src/url_util.h" | 36 #include "url/url_util.h" |
37 #include "googleurl/src/url_util_internal.h" | 37 #include "url/url_util_internal.h" |
38 | 38 |
39 namespace url_canon { | 39 namespace url_canon { |
40 | 40 |
41 namespace { | 41 namespace { |
42 | 42 |
43 // We use the URLComponentSource for the outer URL, as it can have replacements, | 43 // We use the URLComponentSource for the outer URL, as it can have replacements, |
44 // whereas the inner_url can't, so it uses spec. | 44 // whereas the inner_url can't, so it uses spec. |
45 template<typename CHAR, typename UCHAR> | 45 template<typename CHAR, typename UCHAR> |
46 bool DoCanonicalizeFileSystemURL(const CHAR* spec, | 46 bool DoCanonicalizeFileSystemURL(const CHAR* spec, |
47 const URLComponentSource<CHAR>& source, | 47 const URLComponentSource<CHAR>& source, |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 url_parse::Parsed* new_parsed) { | 149 url_parse::Parsed* new_parsed) { |
150 RawCanonOutput<1024> utf8; | 150 RawCanonOutput<1024> utf8; |
151 URLComponentSource<char> source(base); | 151 URLComponentSource<char> source(base); |
152 url_parse::Parsed parsed(base_parsed); | 152 url_parse::Parsed parsed(base_parsed); |
153 SetupUTF16OverrideComponents(base, replacements, &utf8, &source, &parsed); | 153 SetupUTF16OverrideComponents(base, replacements, &utf8, &source, &parsed); |
154 return DoCanonicalizeFileSystemURL<char, unsigned char>( | 154 return DoCanonicalizeFileSystemURL<char, unsigned char>( |
155 base, source, parsed, charset_converter, output, new_parsed); | 155 base, source, parsed, charset_converter, output, new_parsed); |
156 } | 156 } |
157 | 157 |
158 } // namespace url_canon | 158 } // namespace url_canon |
OLD | NEW |