Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)

Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 15 insertions, 15 deletions

diff --git a/Source/WebCore/mathml/MathMLElement.cpp b/Source/WebCore/mathml/MathMLElement.cpp
index 86584708a..c3afc9acc 100644
--- a/Source/WebCore/mathml/MathMLElement.cpp
+++ b/Source/WebCore/mathml/MathMLElement.cpp
@@ -65,16 +65,16 @@ int MathMLElement::rowSpan() const
     return std::max(1, rowSpanValue.toInt());
 }
 
-void MathMLElement::parseAttribute(const Attribute& attribute)
+void MathMLElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
 {
-    if (attribute.name() == rowspanAttr) {
+    if (name == rowspanAttr) {
         if (renderer() && renderer()->isTableCell() && hasTagName(mtdTag))
             toRenderTableCell(renderer())->colSpanOrRowSpanChanged();
-    } else if (attribute.name() == columnspanAttr) {
+    } else if (name == columnspanAttr) {
         if (renderer() && renderer()->isTableCell() && hasTagName(mtdTag))
             toRenderTableCell(renderer())->colSpanOrRowSpanChanged();
     } else
-        StyledElement::parseAttribute(attribute);
+        StyledElement::parseAttribute(name, value);
 }
 
 bool MathMLElement::isPresentationAttribute(const QualifiedName& name) const
@@ -84,32 +84,32 @@ bool MathMLElement::isPresentationAttribute(const QualifiedName& name) const
     return StyledElement::isPresentationAttribute(name);
 }
 
-void MathMLElement::collectStyleForAttribute(const Attribute& attribute, StylePropertySet* style)
+void MathMLElement::collectStyleForPresentationAttribute(const Attribute& attribute, StylePropertySet* style)
 {
     if (attribute.name() == mathbackgroundAttr)
-        addPropertyToAttributeStyle(style, CSSPropertyBackgroundColor, attribute.value());
+        addPropertyToPresentationAttributeStyle(style, CSSPropertyBackgroundColor, attribute.value());
     else if (attribute.name() == mathsizeAttr) {
         // The following three values of mathsize are handled in WebCore/css/mathml.css
         if (attribute.value() != "normal" && attribute.value() != "small" && attribute.value() != "big")
-            addPropertyToAttributeStyle(style, CSSPropertyFontSize, attribute.value());
+            addPropertyToPresentationAttributeStyle(style, CSSPropertyFontSize, attribute.value());
     } else if (attribute.name() == mathcolorAttr)
-        addPropertyToAttributeStyle(style, CSSPropertyColor, attribute.value());
+        addPropertyToPresentationAttributeStyle(style, CSSPropertyColor, attribute.value());
     // FIXME: deprecated attributes that should loose in a conflict with a non deprecated attribute
     else if (attribute.name() == fontsizeAttr)
-        addPropertyToAttributeStyle(style, CSSPropertyFontSize, attribute.value());
+        addPropertyToPresentationAttributeStyle(style, CSSPropertyFontSize, attribute.value());
     else if (attribute.name() == backgroundAttr)
-        addPropertyToAttributeStyle(style, CSSPropertyBackgroundColor, attribute.value());
+        addPropertyToPresentationAttributeStyle(style, CSSPropertyBackgroundColor, attribute.value());
     else if (attribute.name() == colorAttr)
-        addPropertyToAttributeStyle(style, CSSPropertyColor, attribute.value());
+        addPropertyToPresentationAttributeStyle(style, CSSPropertyColor, attribute.value());
     else if (attribute.name() == fontstyleAttr)
-        addPropertyToAttributeStyle(style, CSSPropertyFontStyle, attribute.value());
+        addPropertyToPresentationAttributeStyle(style, CSSPropertyFontStyle, attribute.value());
     else if (attribute.name() == fontweightAttr)
-        addPropertyToAttributeStyle(style, CSSPropertyFontWeight, attribute.value());
+        addPropertyToPresentationAttributeStyle(style, CSSPropertyFontWeight, attribute.value());
     else if (attribute.name() == fontfamilyAttr)
-        addPropertyToAttributeStyle(style, CSSPropertyFontFamily, attribute.value());
+        addPropertyToPresentationAttributeStyle(style, CSSPropertyFontFamily, attribute.value());
     else {
         ASSERT(!isPresentationAttribute(attribute.name()));
-        StyledElement::collectStyleForAttribute(attribute, style);
+        StyledElement::collectStyleForPresentationAttribute(attribute, style);
     }
 }