Merge WebKit at r60074: Initial merge by git

Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7

39 files changed, 64 insertions, 63 deletions

diff --git a/WebCore/wml/WMLAElement.cpp b/WebCore/wml/WMLAElement.cpp
index 55b2698..99e30e9 100644
--- a/WebCore/wml/WMLAElement.cpp
+++ b/WebCore/wml/WMLAElement.cpp
@@ -29,6 +29,7 @@
 #if ENABLE(WML)
 #include "WMLAElement.h"
 
+#include "Attribute.h"
 #include "Event.h"
 #include "EventHandler.h"
 #include "EventNames.h"
@@ -36,7 +37,6 @@
 #include "FrameLoader.h"
 #include "HTMLNames.h"
 #include "KeyboardEvent.h"
-#include "MappedAttribute.h"
 #include "MouseEvent.h"
 #include "RenderBox.h"
 #include "ResourceHandle.h"
@@ -51,7 +51,7 @@ WMLAElement::WMLAElement(const QualifiedName& tagName, Document* doc)
 {
 }
 
-void WMLAElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLAElement::parseMappedAttribute(Attribute* attr)
 {
     if (attr->name() == HTMLNames::hrefAttr) {
         bool wasLink = isLink();
@@ -140,7 +140,7 @@ void WMLAElement::defaultEventHandler(Event* event)
         }
  
         if (!event->defaultPrevented() && document()->frame()) {
-            String url = document()->completeURL(deprecatedParseURL(getAttribute(HTMLNames::hrefAttr)));
+            KURL url = document()->completeURL(deprecatedParseURL(getAttribute(HTMLNames::hrefAttr)));
             document()->frame()->loader()->urlSelected(url, target(), event, false, false, true, SendReferrer);
         }
 
diff --git a/WebCore/wml/WMLAElement.h b/WebCore/wml/WMLAElement.h
index 7b19081..b21ebb6 100644
--- a/WebCore/wml/WMLAElement.h
+++ b/WebCore/wml/WMLAElement.h
@@ -39,7 +39,7 @@ public:
     virtual bool isMouseFocusable() const;
     virtual bool isKeyboardFocusable(KeyboardEvent*) const;
 
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
     virtual void defaultEventHandler(Event*);
 
     virtual void accessKeyAction(bool fullAction);
diff --git a/WebCore/wml/WMLAccessElement.cpp b/WebCore/wml/WMLAccessElement.cpp
index a633260..d6e6768 100644
--- a/WebCore/wml/WMLAccessElement.cpp
+++ b/WebCore/wml/WMLAccessElement.cpp
@@ -23,7 +23,7 @@
 #if ENABLE(WML)
 #include "WMLAccessElement.h"
 
-#include "MappedAttribute.h"
+#include "Attribute.h"
 #include "WMLDocument.h"
 #include "WMLNames.h"
 #include "WMLVariables.h"
@@ -37,7 +37,7 @@ WMLAccessElement::WMLAccessElement(const QualifiedName& tagName, Document* doc)
 {
 }
 
-void WMLAccessElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLAccessElement::parseMappedAttribute(Attribute* attr)
 {
     if (attr->name() == domainAttr) {
         String value = parseValueForbiddingVariableReferences(attr->value());
diff --git a/WebCore/wml/WMLAccessElement.h b/WebCore/wml/WMLAccessElement.h
index 1bc44ab..83290e4 100644
--- a/WebCore/wml/WMLAccessElement.h
+++ b/WebCore/wml/WMLAccessElement.h
@@ -30,7 +30,7 @@ class WMLAccessElement : public WMLElement {
 public:
     WMLAccessElement(const QualifiedName& tagName, Document*);
 
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
     virtual void insertedIntoDocument();
 
 private:
diff --git a/WebCore/wml/WMLBRElement.cpp b/WebCore/wml/WMLBRElement.cpp
index 035619f..d24d2a2 100644
--- a/WebCore/wml/WMLBRElement.cpp
+++ b/WebCore/wml/WMLBRElement.cpp
@@ -28,9 +28,9 @@
 #if ENABLE(WML)
 #include "WMLBRElement.h"
 
+#include "Attribute.h"
 #include "CSSPropertyNames.h"
 #include "HTMLNames.h"
-#include "MappedAttribute.h"
 #include "RenderBR.h"
 
 namespace WebCore {
@@ -50,7 +50,7 @@ bool WMLBRElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntr
     return WMLElement::mapToEntry(attrName, result);
 }
 
-void WMLBRElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLBRElement::parseMappedAttribute(Attribute* attr)
 {
     if (attr->name() == HTMLNames::clearAttr) {
         // If the string is empty, then don't add the clear property. 
diff --git a/WebCore/wml/WMLBRElement.h b/WebCore/wml/WMLBRElement.h
index 4d65ed4..41c8776 100644
--- a/WebCore/wml/WMLBRElement.h
+++ b/WebCore/wml/WMLBRElement.h
@@ -35,7 +35,7 @@ public:
     WMLBRElement(const QualifiedName& tagName, Document*);
 
     virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
 
     virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
 };
diff --git a/WebCore/wml/WMLCardElement.cpp b/WebCore/wml/WMLCardElement.cpp
index 45752cd..539dcd3 100644
--- a/WebCore/wml/WMLCardElement.cpp
+++ b/WebCore/wml/WMLCardElement.cpp
@@ -23,15 +23,15 @@
 #if ENABLE(WML)
 #include "WMLCardElement.h"
 
+#include "Attribute.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "HTMLNames.h"
-#include "MappedAttribute.h"
 #include "NodeList.h"
 #include "Page.h"
 #include "RenderStyle.h"
-#include "WMLDocument.h"
 #include "WMLDoElement.h"
+#include "WMLDocument.h"
 #include "WMLInputElement.h"
 #include "WMLIntrinsicEventHandler.h"
 #include "WMLNames.h"
@@ -209,7 +209,7 @@ void WMLCardElement::handleDeckLevelTaskOverridesIfNeeded()
         (*it)->setActive(!cardDoElementNames.contains((*it)->name()));
 }
 
-void WMLCardElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLCardElement::parseMappedAttribute(Attribute* attr)
 {
     WMLIntrinsicEventType eventType = WMLIntrinsicEventUnknown;
 
diff --git a/WebCore/wml/WMLCardElement.h b/WebCore/wml/WMLCardElement.h
index 972961e..40eec36 100644
--- a/WebCore/wml/WMLCardElement.h
+++ b/WebCore/wml/WMLCardElement.h
@@ -47,7 +47,7 @@ public:
     void handleIntrinsicEventIfNeeded();
     void handleDeckLevelTaskOverridesIfNeeded();
 
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
     virtual void insertedIntoDocument();
     virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
 
diff --git a/WebCore/wml/WMLDoElement.cpp b/WebCore/wml/WMLDoElement.cpp
index 38ad5dd..6a40fc9 100644
--- a/WebCore/wml/WMLDoElement.cpp
+++ b/WebCore/wml/WMLDoElement.cpp
@@ -23,19 +23,19 @@
 #if ENABLE(WML)
 #include "WMLDoElement.h"
 
+#include "Attribute.h"
 #include "Event.h"
 #include "EventNames.h"
 #include "HTMLNames.h"
 #include "KeyboardEvent.h"
-#include "MappedAttribute.h"
 #include "Page.h"
 #include "RenderButton.h"
 #include "WMLCardElement.h"
 #include "WMLDocument.h"
-#include "WMLTaskElement.h"
-#include "WMLTimerElement.h"
 #include "WMLNames.h"
 #include "WMLPageState.h"
+#include "WMLTaskElement.h"
+#include "WMLTimerElement.h"
 #include "WMLVariables.h"
 
 namespace WebCore {
@@ -95,7 +95,7 @@ void WMLDoElement::defaultEventHandler(Event* event)
     }
 }
 
-void WMLDoElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLDoElement::parseMappedAttribute(Attribute* attr)
 {
     if (attr->name() == HTMLNames::typeAttr)
         m_type = parseValueForbiddingVariableReferences(attr->value());
diff --git a/WebCore/wml/WMLDoElement.h b/WebCore/wml/WMLDoElement.h
index fe48eae..024ef80 100644
--- a/WebCore/wml/WMLDoElement.h
+++ b/WebCore/wml/WMLDoElement.h
@@ -33,7 +33,7 @@ public:
     WMLDoElement(const QualifiedName& tagName, Document*);
 
     virtual void defaultEventHandler(Event*);
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
     virtual void insertedIntoDocument();
     virtual void removedFromDocument();
 
diff --git a/WebCore/wml/WMLElement.cpp b/WebCore/wml/WMLElement.cpp
index 89fd07a..dbe55a9 100644
--- a/WebCore/wml/WMLElement.cpp
+++ b/WebCore/wml/WMLElement.cpp
@@ -23,9 +23,9 @@
 #if ENABLE(WML)
 #include "WMLElement.h"
 
+#include "Attribute.h"
 #include "CSSPropertyNames.h"
 #include "HTMLNames.h"
-#include "MappedAttribute.h"
 #include "RenderObject.h"
 #include "WMLErrorHandling.h"
 #include "WMLNames.h"
@@ -58,7 +58,7 @@ bool WMLElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry&
     return StyledElement::mapToEntry(attrName, result);
 }
     
-void WMLElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLElement::parseMappedAttribute(Attribute* attr)
 {
     if (attr->name() == idAttributeName()
         || attr->name() == HTMLNames::classAttr
diff --git a/WebCore/wml/WMLElement.h b/WebCore/wml/WMLElement.h
index 0bfaceb..a7c82c0 100644
--- a/WebCore/wml/WMLElement.h
+++ b/WebCore/wml/WMLElement.h
@@ -35,7 +35,7 @@ public:
     virtual bool isWMLTaskElement() const { return false; }
 
     virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
 
     virtual String title() const;
 
diff --git a/WebCore/wml/WMLFieldSetElement.cpp b/WebCore/wml/WMLFieldSetElement.cpp
index 3930de2..c89e669 100644
--- a/WebCore/wml/WMLFieldSetElement.cpp
+++ b/WebCore/wml/WMLFieldSetElement.cpp
@@ -23,8 +23,8 @@
 #if ENABLE(WML)
 #include "WMLFieldSetElement.h"
 
+#include "Attribute.h"
 #include "HTMLNames.h"
-#include "MappedAttribute.h"
 #include "RenderFieldset.h"
 #include "Text.h"
 #include "WMLElementFactory.h"
diff --git a/WebCore/wml/WMLGoElement.cpp b/WebCore/wml/WMLGoElement.cpp
index 4378f34..db4880c 100644
--- a/WebCore/wml/WMLGoElement.cpp
+++ b/WebCore/wml/WMLGoElement.cpp
@@ -23,11 +23,11 @@
 #if ENABLE(WML)
 #include "WMLGoElement.h"
 
+#include "Attribute.h"
 #include "FormData.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "HTMLNames.h"
-#include "MappedAttribute.h"
 #include "ResourceRequest.h"
 #include "TextEncoding.h"
 #include "WMLCardElement.h"
@@ -61,7 +61,7 @@ void WMLGoElement::deregisterPostfieldElement(WMLPostfieldElement* postfield)
     m_postfieldElements.remove(position);
 }
 
-void WMLGoElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLGoElement::parseMappedAttribute(Attribute* attr)
 {
     if (attr->name() == HTMLNames::methodAttr)
         m_formDataBuilder.parseMethodType(attr->value());
diff --git a/WebCore/wml/WMLGoElement.h b/WebCore/wml/WMLGoElement.h
index 36c7be2..f602a39 100644
--- a/WebCore/wml/WMLGoElement.h
+++ b/WebCore/wml/WMLGoElement.h
@@ -38,7 +38,7 @@ public:
     void registerPostfieldElement(WMLPostfieldElement*);
     void deregisterPostfieldElement(WMLPostfieldElement*);
 
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
     virtual void executeTask();
 
 private:
diff --git a/WebCore/wml/WMLImageElement.cpp b/WebCore/wml/WMLImageElement.cpp
index e577218..f6b3f1e 100644
--- a/WebCore/wml/WMLImageElement.cpp
+++ b/WebCore/wml/WMLImageElement.cpp
@@ -23,11 +23,11 @@
 #if ENABLE(WML)
 #include "WMLImageElement.h"
 
+#include "Attribute.h"
 #include "CSSPropertyNames.h"
 #include "CSSValueKeywords.h"
 #include "HTMLElement.h"
 #include "HTMLNames.h"
-#include "MappedAttribute.h"
 #include "RenderImage.h"
 #include "WMLNames.h"
 #include "WMLVariables.h"
@@ -65,7 +65,7 @@ bool WMLImageElement::mapToEntry(const QualifiedName& attrName, MappedAttributeE
     return WMLElement::mapToEntry(attrName, result);
 }
 
-void WMLImageElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLImageElement::parseMappedAttribute(Attribute* attr)
 {
     const QualifiedName& attrName = attr->name();
 
diff --git a/WebCore/wml/WMLImageElement.h b/WebCore/wml/WMLImageElement.h
index 8ace3ba..2ec5031 100644
--- a/WebCore/wml/WMLImageElement.h
+++ b/WebCore/wml/WMLImageElement.h
@@ -33,7 +33,7 @@ public:
     virtual ~WMLImageElement();
 
     virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
 
     virtual void attach();
     virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
diff --git a/WebCore/wml/WMLInputElement.cpp b/WebCore/wml/WMLInputElement.cpp
index 979a294..bf407c1 100644
--- a/WebCore/wml/WMLInputElement.cpp
+++ b/WebCore/wml/WMLInputElement.cpp
@@ -23,12 +23,12 @@
 #if ENABLE(WML)
 #include "WMLInputElement.h"
 
+#include "Attribute.h"
 #include "EventNames.h"
 #include "FormDataList.h"
 #include "Frame.h"
 #include "HTMLNames.h"
 #include "KeyboardEvent.h"
-#include "MappedAttribute.h"
 #include "RenderTextControlSingleLine.h"
 #include "TextEvent.h"
 #include "WMLDocument.h"
@@ -195,7 +195,7 @@ void WMLInputElement::accessKeyAction(bool)
     focus(false);
 }
 
-void WMLInputElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLInputElement::parseMappedAttribute(Attribute* attr)
 {
     if (attr->name() == HTMLNames::nameAttr)
         m_data.setName(parseValueForbiddingVariableReferences(attr->value()));
diff --git a/WebCore/wml/WMLInputElement.h b/WebCore/wml/WMLInputElement.h
index bd4e175..b8748fd 100644
--- a/WebCore/wml/WMLInputElement.h
+++ b/WebCore/wml/WMLInputElement.h
@@ -67,7 +67,7 @@ public:
 
     virtual void select();
     virtual void accessKeyAction(bool sendToAnyElement);
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
 
     virtual void copyNonAttributeProperties(const Element* source);
 
diff --git a/WebCore/wml/WMLMetaElement.cpp b/WebCore/wml/WMLMetaElement.cpp
index 81109ae..e28afaf 100644
--- a/WebCore/wml/WMLMetaElement.cpp
+++ b/WebCore/wml/WMLMetaElement.cpp
@@ -23,9 +23,9 @@
 #if ENABLE(WML)
 #include "WMLMetaElement.h"
 
+#include "Attribute.h"
 #include "Document.h"
 #include "HTMLNames.h"
-#include "MappedAttribute.h"
 
 namespace WebCore {
 
@@ -38,7 +38,7 @@ WMLMetaElement::~WMLMetaElement()
 {
 }
 
-void WMLMetaElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLMetaElement::parseMappedAttribute(Attribute* attr)
 {
     if (attr->name() == HTMLNames::http_equivAttr)
         m_equiv = parseValueForbiddingVariableReferences(attr->value());
diff --git a/WebCore/wml/WMLMetaElement.h b/WebCore/wml/WMLMetaElement.h
index 713e225..765490d 100644
--- a/WebCore/wml/WMLMetaElement.h
+++ b/WebCore/wml/WMLMetaElement.h
@@ -31,7 +31,7 @@ public:
     WMLMetaElement(const QualifiedName& tagName, Document*);
     virtual ~WMLMetaElement();
 
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
     virtual void insertedIntoDocument();
 
 private:
diff --git a/WebCore/wml/WMLOnEventElement.cpp b/WebCore/wml/WMLOnEventElement.cpp
index 6fc4e8b..34518c3 100644
--- a/WebCore/wml/WMLOnEventElement.cpp
+++ b/WebCore/wml/WMLOnEventElement.cpp
@@ -23,8 +23,8 @@
 #if ENABLE(WML)
 #include "WMLOnEventElement.h"
 
+#include "Attribute.h"
 #include "HTMLNames.h"
-#include "MappedAttribute.h"
 #include "WMLErrorHandling.h"
 #include "WMLEventHandlingElement.h"
 #include "WMLIntrinsicEventHandler.h"
@@ -41,7 +41,7 @@ WMLOnEventElement::WMLOnEventElement(const QualifiedName& tagName, Document* doc
 {
 }
 
-void WMLOnEventElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLOnEventElement::parseMappedAttribute(Attribute* attr)
 {
     if (attr->name() == HTMLNames::typeAttr) {
         String parsedValue = parseValueForbiddingVariableReferences(attr->value());
diff --git a/WebCore/wml/WMLOnEventElement.h b/WebCore/wml/WMLOnEventElement.h
index de33600..4bc4bca 100644
--- a/WebCore/wml/WMLOnEventElement.h
+++ b/WebCore/wml/WMLOnEventElement.h
@@ -33,7 +33,7 @@ class WMLOnEventElement : public WMLElement {
 public:
     WMLOnEventElement(const QualifiedName& tagName, Document*);
 
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
 
     void registerTask(WMLTaskElement*);
     void deregisterTask(WMLTaskElement*);
diff --git a/WebCore/wml/WMLOptGroupElement.cpp b/WebCore/wml/WMLOptGroupElement.cpp
index 9a7ea88..fde3474 100644
--- a/WebCore/wml/WMLOptGroupElement.cpp
+++ b/WebCore/wml/WMLOptGroupElement.cpp
@@ -23,8 +23,8 @@
 #if ENABLE(WML)
 #include "WMLOptGroupElement.h"
 
+#include "Attribute.h"
 #include "Document.h"
-#include "MappedAttribute.h"
 #include "HTMLNames.h"
 #include "NodeRenderStyle.h"
 #include "RenderStyle.h"
@@ -118,7 +118,7 @@ void WMLOptGroupElement::childrenChanged(bool changedByParser, Node* beforeChang
     WMLFormControlElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
 }
 
-void WMLOptGroupElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLOptGroupElement::parseMappedAttribute(Attribute* attr)
 {
     WMLFormControlElement::parseMappedAttribute(attr);
     recalcSelectOptions();
diff --git a/WebCore/wml/WMLOptGroupElement.h b/WebCore/wml/WMLOptGroupElement.h
index e1b9217..682c68c 100644
--- a/WebCore/wml/WMLOptGroupElement.h
+++ b/WebCore/wml/WMLOptGroupElement.h
@@ -44,7 +44,7 @@ public:
 
     virtual void accessKeyAction(bool sendToAnyElement);
     virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
 
     virtual void attach();
     virtual void detach();
diff --git a/WebCore/wml/WMLOptionElement.cpp b/WebCore/wml/WMLOptionElement.cpp
index ac41a06..ca4ea91 100644
--- a/WebCore/wml/WMLOptionElement.cpp
+++ b/WebCore/wml/WMLOptionElement.cpp
@@ -23,8 +23,8 @@
 #if ENABLE(WML)
 #include "WMLOptionElement.h"
 
+#include "Attribute.h"
 #include "HTMLNames.h"
-#include "MappedAttribute.h"
 #include "NodeRenderStyle.h"
 #include "RenderStyle.h"
 #include "WMLNames.h"
@@ -75,7 +75,7 @@ void WMLOptionElement::childrenChanged(bool changedByParser, Node* beforeChange,
     WMLFormControlElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
 }
 
-void WMLOptionElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLOptionElement::parseMappedAttribute(Attribute* attr)
 {
     if (attr->name() == HTMLNames::valueAttr)
         m_data.setValue(parseValueSubstitutingVariableReferences(attr->value()));
diff --git a/WebCore/wml/WMLOptionElement.h b/WebCore/wml/WMLOptionElement.h
index 6283070..3831f7d 100644
--- a/WebCore/wml/WMLOptionElement.h
+++ b/WebCore/wml/WMLOptionElement.h
@@ -39,7 +39,7 @@ public:
 
     virtual void accessKeyAction(bool sendToAnyElement);
     virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
 
     virtual void attach();
     virtual void detach();
diff --git a/WebCore/wml/WMLPElement.cpp b/WebCore/wml/WMLPElement.cpp
index 0cec653..ca76022 100644
--- a/WebCore/wml/WMLPElement.cpp
+++ b/WebCore/wml/WMLPElement.cpp
@@ -26,11 +26,11 @@
 #if ENABLE(WML)
 #include "WMLPElement.h"
 
+#include "Attribute.h"
 #include "CSSPropertyNames.h"
 #include "CSSValueKeywords.h"
 #include "Document.h"
 #include "HTMLNames.h"
-#include "MappedAttribute.h"
 #include "NodeList.h"
 #include "WMLNames.h"
 
@@ -53,7 +53,7 @@ bool WMLPElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry
     return WMLElement::mapToEntry(attrName, result);
 }
 
-void WMLPElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLPElement::parseMappedAttribute(Attribute* attr)
 {
     if (attr->name() == HTMLNames::alignAttr) {
         const AtomicString& value = attr->value();
diff --git a/WebCore/wml/WMLPElement.h b/WebCore/wml/WMLPElement.h
index 292e54f..48f98f8 100644
--- a/WebCore/wml/WMLPElement.h
+++ b/WebCore/wml/WMLPElement.h
@@ -34,7 +34,7 @@ public:
     WMLPElement(const QualifiedName& tagName, Document*);
 
     virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
 
     virtual void insertedIntoDocument();
 
diff --git a/WebCore/wml/WMLSelectElement.cpp b/WebCore/wml/WMLSelectElement.cpp
index bc86d12..2f8ebf6 100644
--- a/WebCore/wml/WMLSelectElement.cpp
+++ b/WebCore/wml/WMLSelectElement.cpp
@@ -22,8 +22,9 @@
 
 #if ENABLE(WML)
 #include "WMLSelectElement.h"
+
+#include "Attribute.h"
 #include "HTMLNames.h"
-#include "MappedAttribute.h"
 #include "OptionElement.h"
 #include "RenderListBox.h"
 #include "RenderMenuList.h"
@@ -129,7 +130,7 @@ void WMLSelectElement::childrenChanged(bool changedByParser, Node* beforeChange,
     WMLFormControlElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
 }
 
-void WMLSelectElement::parseMappedAttribute(MappedAttribute* attr) 
+void WMLSelectElement::parseMappedAttribute(Attribute* attr) 
 {
     if (attr->name() == HTMLNames::multipleAttr)
         SelectElement::parseMultipleAttribute(m_data, this, attr);
diff --git a/WebCore/wml/WMLSelectElement.h b/WebCore/wml/WMLSelectElement.h
index 3ec7fd2..09a96f9 100644
--- a/WebCore/wml/WMLSelectElement.h
+++ b/WebCore/wml/WMLSelectElement.h
@@ -59,7 +59,7 @@ public:
 
     virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
 
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
 
     virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
     virtual bool appendFormData(FormDataList&, bool);
diff --git a/WebCore/wml/WMLSetvarElement.cpp b/WebCore/wml/WMLSetvarElement.cpp
index 5e10ca8..1407b3f 100644
--- a/WebCore/wml/WMLSetvarElement.cpp
+++ b/WebCore/wml/WMLSetvarElement.cpp
@@ -23,8 +23,8 @@
 #if ENABLE(WML)
 #include "WMLSetvarElement.h"
 
+#include "Attribute.h"
 #include "HTMLNames.h"
-#include "MappedAttribute.h"
 #include "WMLErrorHandling.h"
 #include "WMLTaskElement.h"
 #include "WMLVariables.h"
@@ -40,7 +40,7 @@ WMLSetvarElement::~WMLSetvarElement()
 {
 }
 
-void WMLSetvarElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLSetvarElement::parseMappedAttribute(Attribute* attr)
 {
     if (attr->name() == HTMLNames::nameAttr) {
         if (!isValidVariableName(parseValueSubstitutingVariableReferences(attr->value(), WMLErrorInvalidVariableName))) {
diff --git a/WebCore/wml/WMLSetvarElement.h b/WebCore/wml/WMLSetvarElement.h
index 0171b95..410db70 100644
--- a/WebCore/wml/WMLSetvarElement.h
+++ b/WebCore/wml/WMLSetvarElement.h
@@ -31,7 +31,7 @@ public:
     WMLSetvarElement(const QualifiedName& tagName, Document*);
     virtual ~WMLSetvarElement();
 
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
     virtual void insertedIntoDocument();
     virtual void removedFromDocument();
 
diff --git a/WebCore/wml/WMLTableElement.cpp b/WebCore/wml/WMLTableElement.cpp
index b589fe8..4d5e785 100644
--- a/WebCore/wml/WMLTableElement.cpp
+++ b/WebCore/wml/WMLTableElement.cpp
@@ -23,12 +23,12 @@
 #if ENABLE(WML)
 #include "WMLTableElement.h"
 
-#include "CharacterNames.h"
+#include "Attribute.h"
 #include "CSSPropertyNames.h"
 #include "CSSValueKeywords.h"
+#include "CharacterNames.h"
 #include "Document.h"
 #include "HTMLNames.h"
-#include "MappedAttribute.h"
 #include "NodeList.h"
 #include "RenderObject.h"
 #include "Text.h"
@@ -59,7 +59,7 @@ bool WMLTableElement::mapToEntry(const QualifiedName& attrName, MappedAttributeE
     return WMLElement::mapToEntry(attrName, result);
 }
 
-void WMLTableElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLTableElement::parseMappedAttribute(Attribute* attr)
 {
     if (attr->name() == columnsAttr) {
         bool isNumber = false;
diff --git a/WebCore/wml/WMLTableElement.h b/WebCore/wml/WMLTableElement.h
index baf46af..22a9676 100644
--- a/WebCore/wml/WMLTableElement.h
+++ b/WebCore/wml/WMLTableElement.h
@@ -34,7 +34,7 @@ public:
     virtual ~WMLTableElement();
 
     virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
 
     virtual void finishParsingChildren();
 
diff --git a/WebCore/wml/WMLTemplateElement.cpp b/WebCore/wml/WMLTemplateElement.cpp
index 2575c9a..2537c3b 100644
--- a/WebCore/wml/WMLTemplateElement.cpp
+++ b/WebCore/wml/WMLTemplateElement.cpp
@@ -23,7 +23,7 @@
 #if ENABLE(WML)
 #include "WMLTemplateElement.h"
 
-#include "MappedAttribute.h"
+#include "Attribute.h"
 #include "NodeList.h"
 #include "WMLCardElement.h"
 #include "WMLDocument.h"
@@ -43,7 +43,7 @@ WMLTemplateElement::~WMLTemplateElement()
 {
 }
 
-void WMLTemplateElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLTemplateElement::parseMappedAttribute(Attribute* attr)
 {
     WMLIntrinsicEventType eventType = WMLIntrinsicEventUnknown;
 
diff --git a/WebCore/wml/WMLTemplateElement.h b/WebCore/wml/WMLTemplateElement.h
index 3fc0eda..e11d089 100644
--- a/WebCore/wml/WMLTemplateElement.h
+++ b/WebCore/wml/WMLTemplateElement.h
@@ -32,7 +32,7 @@ public:
     WMLTemplateElement(const QualifiedName&, Document*);
     virtual ~WMLTemplateElement();
 
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
 
     static void registerTemplatesInDocument(Document*);
 };
diff --git a/WebCore/wml/WMLTimerElement.cpp b/WebCore/wml/WMLTimerElement.cpp
index c6476f7..48eed34 100644
--- a/WebCore/wml/WMLTimerElement.cpp
+++ b/WebCore/wml/WMLTimerElement.cpp
@@ -23,8 +23,8 @@
 #if ENABLE(WML)
 #include "WMLTimerElement.h"
 
+#include "Attribute.h"
 #include "HTMLNames.h"
-#include "MappedAttribute.h"
 #include "WMLCardElement.h"
 #include "WMLDocument.h"
 #include "WMLNames.h"
@@ -42,7 +42,7 @@ WMLTimerElement::WMLTimerElement(const QualifiedName& tagName, Document* doc)
 {
 }
 
-void WMLTimerElement::parseMappedAttribute(MappedAttribute* attr)
+void WMLTimerElement::parseMappedAttribute(Attribute* attr)
 {
     if (attr->name() == HTMLNames::nameAttr)
         m_name = parseValueForbiddingVariableReferences(attr->value());
diff --git a/WebCore/wml/WMLTimerElement.h b/WebCore/wml/WMLTimerElement.h
index 8402027..09f3fbf 100644
--- a/WebCore/wml/WMLTimerElement.h
+++ b/WebCore/wml/WMLTimerElement.h
@@ -33,7 +33,7 @@ class WMLTimerElement : public WMLElement {
 public:
     WMLTimerElement(const QualifiedName& tagName, Document*);
 
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
     virtual void insertedIntoDocument();
     virtual void removedFromDocument();