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/HTMLImageElement.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/HTMLImageElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLImageElement.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/html/HTMLImageElement.cpp b/WebCore/html/HTMLImageElement.cpp index 29ea592..d66075e 100644 --- a/WebCore/html/HTMLImageElement.cpp +++ b/WebCore/html/HTMLImageElement.cpp @@ -24,7 +24,6 @@ #include "HTMLImageElement.h" #include "Attribute.h" -#include "CSSHelper.h" #include "CSSPropertyNames.h" #include "CSSValueKeywords.h" #include "EventNames.h" @@ -32,6 +31,7 @@ #include "HTMLDocument.h" #include "HTMLFormElement.h" #include "HTMLNames.h" +#include "HTMLParserIdioms.h" #include "RenderImage.h" #include "ScriptEventListener.h" @@ -131,7 +131,7 @@ void HTMLImageElement::parseMappedAttribute(Attribute* attr) if (attr->value().string()[0] == '#') usemap = attr->value(); else - usemap = document()->completeURL(deprecatedParseURL(attr->value())).string(); + usemap = document()->completeURL(stripLeadingAndTrailingHTMLSpaces(attr->value())).string(); setIsLink(!attr->isNull()); } else if (attrName == ismapAttr) ismap = true; @@ -237,7 +237,7 @@ void HTMLImageElement::insertedIntoTree(bool deep) { if (!m_form) { // m_form can be non-null if it was set in constructor. - for (Node* ancestor = parentNode(); ancestor; ancestor = ancestor->parentNode()) { + for (ContainerNode* ancestor = parentNode(); ancestor; ancestor = ancestor->parentNode()) { if (ancestor->hasTagName(formTag)) { m_form = static_cast<HTMLFormElement*>(ancestor); m_form->registerImgElement(this); |