| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2001 Dirk Mueller (mueller@kde.org) | 4 * (C) 2001 Dirk Mueller (mueller@kde.org) |
| 5 * Copyright (C) 2003, 2008, 2009, 2010 Apple Inc. All rights reserved. | 5 * Copyright (C) 2003, 2008, 2009, 2010 Apple Inc. All rights reserved. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 KURL HTMLBaseElement::href() const | 81 KURL HTMLBaseElement::href() const |
| 82 { | 82 { |
| 83 // This does not use the getURLAttribute function because that will resolve
relative to the document's base URL; | 83 // This does not use the getURLAttribute function because that will resolve
relative to the document's base URL; |
| 84 // base elements like this one can be used to set that base URL. Thus we nee
d to resolve relative to the document's | 84 // base elements like this one can be used to set that base URL. Thus we nee
d to resolve relative to the document's |
| 85 // URL and ignore the base URL. | 85 // URL and ignore the base URL. |
| 86 | 86 |
| 87 const AtomicString& attributeValue = fastGetAttribute(hrefAttr); | 87 const AtomicString& attributeValue = fastGetAttribute(hrefAttr); |
| 88 if (attributeValue.isNull()) | 88 if (attributeValue.isNull()) |
| 89 return document()->url(); | 89 return document()->url(); |
| 90 | 90 |
| 91 KURL url = !document()->decoder() ? | 91 KURL url = document()->encoding().isValid() ? |
| 92 KURL(document()->url(), stripLeadingAndTrailingHTMLSpaces(attributeValue
)) : | 92 KURL(document()->url(), stripLeadingAndTrailingHTMLSpaces(attributeValue
)) : |
| 93 KURL(document()->url(), stripLeadingAndTrailingHTMLSpaces(attributeValue
), document()->decoder()->encoding()); | 93 KURL(document()->url(), stripLeadingAndTrailingHTMLSpaces(attributeValue
), document()->encoding()); |
| 94 | 94 |
| 95 if (!url.isValid()) | 95 if (!url.isValid()) |
| 96 return KURL(); | 96 return KURL(); |
| 97 | 97 |
| 98 return url; | 98 return url; |
| 99 } | 99 } |
| 100 | 100 |
| 101 void HTMLBaseElement::setHref(const AtomicString& value) | 101 void HTMLBaseElement::setHref(const AtomicString& value) |
| 102 { | 102 { |
| 103 setAttribute(hrefAttr, value); | 103 setAttribute(hrefAttr, value); |
| 104 } | 104 } |
| 105 | 105 |
| 106 } | 106 } |
| OLD | NEW |