diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/html/HTMLLinkElement.cpp | |
parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/html/HTMLLinkElement.cpp')
-rw-r--r-- | WebCore/html/HTMLLinkElement.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/html/HTMLLinkElement.cpp b/WebCore/html/HTMLLinkElement.cpp index 939b375..6a5c2f6 100644 --- a/WebCore/html/HTMLLinkElement.cpp +++ b/WebCore/html/HTMLLinkElement.cpp @@ -25,7 +25,6 @@ #include "HTMLLinkElement.h" #include "Attribute.h" -#include "CSSHelper.h" #include "CachedCSSStyleSheet.h" #include "CachedResourceLoader.h" #include "Document.h" @@ -34,6 +33,7 @@ #include "FrameLoaderClient.h" #include "FrameTree.h" #include "HTMLNames.h" +#include "HTMLParserIdioms.h" #include "MediaList.h" #include "MediaQueryEvaluator.h" #include "Page.h" @@ -118,7 +118,7 @@ void HTMLLinkElement::parseMappedAttribute(Attribute* attr) tokenizeRelAttribute(attr->value(), m_relAttribute); process(); } else if (attr->name() == hrefAttr) { - m_url = document()->completeURL(deprecatedParseURL(attr->value())); + m_url = document()->completeURL(stripLeadingAndTrailingHTMLSpaces(attr->value())); process(); } else if (attr->name() == typeAttr) { m_type = attr->value(); |