resolved conflicts for merge of da53ac10 to master

[android-x86/external-webkit.git] / WebCore / wml / WMLPElement.h

diff --git a/WebCore/wml/WMLPElement.h b/WebCore/wml/WMLPElement.h
index 292e54f..48f98f8 100644 (file)
--- 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();