1 files changed, 11 insertions, 13 deletions

diff --git a/WebCore/dom/StyledElement.h b/WebCore/dom/StyledElement.h
index 279282c..6facce7 100644
--- a/WebCore/dom/StyledElement.h
+++ b/WebCore/dom/StyledElement.h
@@ -29,28 +29,28 @@
 #include "CSSPrimitiveValue.h"
 #include "Element.h"
 #include "MappedAttributeEntry.h"
-#include "NamedMappedAttrMap.h"
+#include "NamedNodeMap.h"
 
 namespace WebCore {
 
+class Attribute;
 class CSSMappedAttributeDeclaration;
-class MappedAttribute;
 
 class StyledElement : public Element {
 public:
     virtual ~StyledElement();
 
-    NamedMappedAttrMap* mappedAttributes() { return static_cast<NamedMappedAttrMap*>(namedAttrMap.get()); }
-    const NamedMappedAttrMap* mappedAttributes() const { return static_cast<NamedMappedAttrMap*>(namedAttrMap.get()); }
+    NamedNodeMap* mappedAttributes() { return namedAttrMap.get(); }
+    const NamedNodeMap* mappedAttributes() const { return namedAttrMap.get(); }
 
     bool hasMappedAttributes() const { return namedAttrMap && mappedAttributes()->hasMappedAttributes(); }
     bool isMappedAttribute(const QualifiedName& name) const { MappedAttributeEntry res = eNone; mapToEntry(name, res); return res != eNone; }
 
-    void addCSSLength(MappedAttribute*, int id, const String& value);
-    void addCSSProperty(MappedAttribute*, int id, const String& value);
-    void addCSSProperty(MappedAttribute*, int id, int value);
-    void addCSSImageProperty(MappedAttribute*, int propertyID, const String& url);
-    void addCSSColor(MappedAttribute*, int id, const String& color);
+    void addCSSLength(Attribute*, int id, const String& value);
+    void addCSSProperty(Attribute*, int id, const String& value);
+    void addCSSProperty(Attribute*, int id, int value);
+    void addCSSImageProperty(Attribute*, int propertyID, const String& url);
+    void addCSSColor(Attribute*, int id, const String& color);
 
     static CSSMappedAttributeDeclaration* getMappedAttributeDecl(MappedAttributeEntry, const QualifiedName& name, const AtomicString& value);
     static void setMappedAttributeDecl(MappedAttributeEntry, const QualifiedName& name, const AtomicString& value, CSSMappedAttributeDeclaration*);
@@ -79,7 +79,7 @@ protected:
     }
 
     virtual void attributeChanged(Attribute*, bool preserveDecls = false);
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
     virtual void copyNonAttributeProperties(const Element*);
 
     virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
@@ -92,14 +92,12 @@ protected:
     virtual void didMoveToNewOwnerDocument();
 
 private:
-    void createMappedDecl(MappedAttribute*);
+    void createMappedDecl(Attribute*);
 
     void createInlineStyleDecl();
     void destroyInlineStyleDecl();
     virtual void updateStyleAttribute() const;
 
-    virtual void createAttributeMap() const;
-
     RefPtr<CSSMutableStyleDeclaration> m_inlineStyleDecl;
 };