diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-07-14 10:59:38 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-07-14 10:59:38 (GMT) |
| commit | 2d01fb17dbf7590dd60987b08433252eb95f55e0 (patch) | |
| tree | 6beeb6c07bd64755c5f0ef0208e7002028709757 /src/3rdparty/webkit/WebCore/html/HTMLBaseElement.cpp | |
| parent | b19a64a407a9c69b0df7fd1b12f2f1377a6bc9c0 (diff) | |
| parent | af2b01c4571b468a57cb4e5e72dab481f6d88eb1 (diff) | |
| download | Qt-2d01fb17dbf7590dd60987b08433252eb95f55e0.zip Qt-2d01fb17dbf7590dd60987b08433252eb95f55e0.tar.gz Qt-2d01fb17dbf7590dd60987b08433252eb95f55e0.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/webkit/WebCore/html/HTMLBaseElement.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/html/HTMLBaseElement.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/html/HTMLBaseElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLBaseElement.cpp index a278908..84e359c 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLBaseElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLBaseElement.cpp @@ -30,6 +30,7 @@ #include "HTMLNames.h" #include "KURL.h" #include "MappedAttribute.h" +#include "XSSAuditor.h" namespace WebCore { @@ -48,6 +49,7 @@ HTMLBaseElement::~HTMLBaseElement() void HTMLBaseElement::parseMappedAttribute(MappedAttribute* attr) { if (attr->name() == hrefAttr) { + m_hrefAttrValue = attr->value(); m_href = parseURL(attr->value()); process(); } else if (attr->name() == targetAttr) { @@ -78,7 +80,7 @@ void HTMLBaseElement::process() if (!inDocument()) return; - if (!m_href.isEmpty()) + if (!m_href.isEmpty() && (!document()->frame() || document()->frame()->script()->xssAuditor()->canSetBaseElementURL(m_hrefAttrValue))) document()->setBaseElementURL(KURL(document()->url(), m_href)); if (!m_target.isEmpty()) |