resolved conflicts for merge of da53ac10 to master

[android-x86/external-webkit.git] / WebCore / wml / WMLBRElement.cpp

diff --git a/WebCore/wml/WMLBRElement.cpp b/WebCore/wml/WMLBRElement.cpp
index 035619f..d24d2a2 100644 (file)
--- 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.