| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. | 2 * Copyright (c) 2008, 2009, Google Inc. 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 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "platform/LinkHash.h" | 32 #include "platform/LinkHash.h" |
| 33 | 33 |
| 34 #include "platform/weborigin/KURL.h" |
| 34 #include "public/platform/Platform.h" | 35 #include "public/platform/Platform.h" |
| 35 #include "weborigin/KURL.h" | |
| 36 #include "wtf/text/StringUTF8Adaptor.h" | 36 #include "wtf/text/StringUTF8Adaptor.h" |
| 37 #include <url/url_util.h> | 37 #include <url/url_util.h> |
| 38 | 38 |
| 39 namespace WebCore { | 39 namespace WebCore { |
| 40 | 40 |
| 41 static bool resolveRelative(const KURL& base, const String& relative, url_canon:
:RawCanonOutput<2048>* buffer) | 41 static bool resolveRelative(const KURL& base, const String& relative, url_canon:
:RawCanonOutput<2048>* buffer) |
| 42 { | 42 { |
| 43 // We use these low-level GURL functions to avoid converting back and forth
from UTF-8 unnecessarily. | 43 // We use these low-level GURL functions to avoid converting back and forth
from UTF-8 unnecessarily. |
| 44 url_parse::Parsed parsed; | 44 url_parse::Parsed parsed; |
| 45 StringUTF8Adaptor baseUTF8(base.string()); | 45 StringUTF8Adaptor baseUTF8(base.string()); |
| 46 if (relative.is8Bit()) { | 46 if (relative.is8Bit()) { |
| 47 StringUTF8Adaptor relativeUTF8(relative); | 47 StringUTF8Adaptor relativeUTF8(relative); |
| 48 return url_util::ResolveRelative(baseUTF8.data(), baseUTF8.length(), bas
e.parsed(), relativeUTF8.data(), relativeUTF8.length(), 0, buffer, &parsed); | 48 return url_util::ResolveRelative(baseUTF8.data(), baseUTF8.length(), bas
e.parsed(), relativeUTF8.data(), relativeUTF8.length(), 0, buffer, &parsed); |
| 49 } | 49 } |
| 50 return url_util::ResolveRelative(baseUTF8.data(), baseUTF8.length(), base.pa
rsed(), relative.characters16(), relative.length(), 0, buffer, &parsed); | 50 return url_util::ResolveRelative(baseUTF8.data(), baseUTF8.length(), base.pa
rsed(), relative.characters16(), relative.length(), 0, buffer, &parsed); |
| 51 } | 51 } |
| 52 | 52 |
| 53 LinkHash visitedLinkHash(const KURL& base, const AtomicString& relative) | 53 LinkHash visitedLinkHash(const KURL& base, const AtomicString& relative) |
| 54 { | 54 { |
| 55 if (relative.isNull()) | 55 if (relative.isNull()) |
| 56 return 0; | 56 return 0; |
| 57 url_canon::RawCanonOutput<2048> buffer; | 57 url_canon::RawCanonOutput<2048> buffer; |
| 58 if (!resolveRelative(base, relative.string(), &buffer)) | 58 if (!resolveRelative(base, relative.string(), &buffer)) |
| 59 return 0; | 59 return 0; |
| 60 return blink::Platform::current()->visitedLinkHash(buffer.data(), buffer.len
gth()); | 60 return blink::Platform::current()->visitedLinkHash(buffer.data(), buffer.len
gth()); |
| 61 } | 61 } |
| 62 | 62 |
| 63 } // namespace WebCore | 63 } // namespace WebCore |
| OLD | NEW |