Revert "Merge WebKit r47420"

This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.

1 files changed, 47 insertions, 3 deletions

diff --git a/WebCore/html/HTMLImageElement.cpp b/WebCore/html/HTMLImageElement.cpp
index 932e718..5173964 100644
--- a/WebCore/html/HTMLImageElement.cpp
+++ b/WebCore/html/HTMLImageElement.cpp
@@ -279,11 +279,46 @@ bool HTMLImageElement::isURLAttribute(Attribute* attr) const
         || (attr->name() == usemapAttr && attr->value().string()[0] != '#');
 }
 
-const AtomicString& HTMLImageElement::alt() const
+String HTMLImageElement::name() const
+{
+    return getAttribute(nameAttr);
+}
+
+void HTMLImageElement::setName(const String& value)
+{
+    setAttribute(nameAttr, value);
+}
+
+String HTMLImageElement::align() const
+{
+    return getAttribute(alignAttr);
+}
+
+void HTMLImageElement::setAlign(const String& value)
+{
+    setAttribute(alignAttr, value);
+}
+
+String HTMLImageElement::alt() const
 {
     return getAttribute(altAttr);
 }
 
+void HTMLImageElement::setAlt(const String& value)
+{
+    setAttribute(altAttr, value);
+}
+
+String HTMLImageElement::border() const
+{
+    return getAttribute(borderAttr);
+}
+
+void HTMLImageElement::setBorder(const String& value)
+{
+    setAttribute(borderAttr, value);
+}
+
 bool HTMLImageElement::draggable() const
 {
     // Image elements are draggable by default.
@@ -346,6 +381,16 @@ void HTMLImageElement::setSrc(const String& value)
     setAttribute(srcAttr, value);
 }
 
+String HTMLImageElement::useMap() const
+{
+    return getAttribute(usemapAttr);
+}
+
+void HTMLImageElement::setUseMap(const String& value)
+{
+    setAttribute(usemapAttr, value);
+}
+
 int HTMLImageElement::vspace() const
 {
     // ### return actual vspace
@@ -394,8 +439,7 @@ void HTMLImageElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) cons
     HTMLElement::addSubresourceAttributeURLs(urls);
 
     addSubresourceURL(urls, src());
-    // FIXME: What about when the usemap attribute begins with "#"?
-    addSubresourceURL(urls, document()->completeURL(getAttribute(usemapAttr)));
+    addSubresourceURL(urls, document()->completeURL(useMap()));
 }
 
 }