1 files changed, 5 insertions, 7 deletions
diff --git a/WebCore/html/HTMLElement.cpp b/WebCore/html/HTMLElement.cpp
index 77aa93b..a623f24 100644
--- a/WebCore/html/HTMLElement.cpp
+++ b/WebCore/html/HTMLElement.cpp
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "HTMLElement.h"
 
+#include "Attribute.h"
 #include "CSSPropertyNames.h"
 #include "CSSValueKeywords.h"
 #include "DocumentFragment.h"
@@ -39,7 +40,6 @@
 #include "HTMLFormElement.h"
 #include "HTMLNames.h"
 #include "HTMLTokenizer.h"
-#include "MappedAttribute.h"
 #include "RenderWordBreak.h"
 #include "ScriptEventListener.h"
 #include "Settings.h"
@@ -142,7 +142,7 @@ bool HTMLElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry
     return StyledElement::mapToEntry(attrName, result);
 }
     
-void HTMLElement::parseMappedAttribute(MappedAttribute *attr)
+void HTMLElement::parseMappedAttribute(Attribute* attr)
 {
     if (attr->name() == idAttributeName() || attr->name() == classAttr || attr->name() == styleAttr)
         return StyledElement::parseMappedAttribute(attr);
@@ -569,12 +569,12 @@ void HTMLElement::insertAdjacentText(const String& where, const String& text, Ex
     insertAdjacent(where, textNode.get(), ec);
 }
 
-void HTMLElement::addHTMLAlignment(MappedAttribute* attr)
+void HTMLElement::addHTMLAlignment(Attribute* attr)
 {
     addHTMLAlignmentToStyledElement(this, attr);
 }
 
-void HTMLElement::addHTMLAlignmentToStyledElement(StyledElement* element, MappedAttribute* attr)
+void HTMLElement::addHTMLAlignmentToStyledElement(StyledElement* element, Attribute* attr)
 {
     // Vertical alignment with respect to the current baseline of the text
     // right or left means floating images.
@@ -670,7 +670,7 @@ String HTMLElement::contentEditable() const
     }
 }
 
-void HTMLElement::setContentEditable(MappedAttribute* attr) 
+void HTMLElement::setContentEditable(Attribute* attr) 
 {
     const AtomicString& enabled = attr->value();
     if (enabled.isEmpty() || equalIgnoringCase(enabled, "true")) {
@@ -858,9 +858,7 @@ static HashSet<AtomicStringImpl*>* inlineTagList()
         tagList.add(rpTag.localName().impl());
         tagList.add(rtTag.localName().impl());
         tagList.add(rubyTag.localName().impl());
-#if ENABLE(PROGRESS_TAG)
         tagList.add(progressTag.localName().impl());
-#endif
         tagList.add(meterTag.localName().impl());
     }
     return &tagList;