Imported WebKit commit e09a82039aa4273ab318b71122e92d8e5f233525 (http://svn.webkit.org/repository/webkit/trunk@107223)

1 files changed, 13 insertions, 17 deletions

diff --git a/Source/WebCore/html/HTMLFontElement.cpp b/Source/WebCore/html/HTMLFontElement.cpp
index d0ade290b..86f52984a 100644
--- a/Source/WebCore/html/HTMLFontElement.cpp
+++ b/Source/WebCore/html/HTMLFontElement.cpp
@@ -123,18 +123,6 @@ static bool parseFontSize(const String& input, int& size)
     return true;
 }
 
-bool HTMLFontElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
-{
-    if (attrName == sizeAttr ||
-        attrName == colorAttr ||
-        attrName == faceAttr) {
-        result = eUniversal;
-        return false;
-    }
-    
-    return HTMLElement::mapToEntry(attrName, result);
-}
-
 bool HTMLFontElement::cssValueFromFontSizeNumber(const String& s, int& size)
 {
     int num = 0;
@@ -170,18 +158,26 @@ bool HTMLFontElement::cssValueFromFontSizeNumber(const String& s, int& size)
     return true;
 }
 
-void HTMLFontElement::parseMappedAttribute(Attribute* attr)
+void HTMLFontElement::parseAttribute(Attribute* attr)
 {
     if (attr->name() == sizeAttr) {
         int size = 0;
         if (cssValueFromFontSizeNumber(attr->value(), size))
-            addCSSProperty(attr, CSSPropertyFontSize, size);
+            addCSSProperty(CSSPropertyFontSize, size);
+        else
+            removeCSSProperty(CSSPropertyFontSize);
     } else if (attr->name() == colorAttr) {
-        addCSSColor(attr, CSSPropertyColor, attr->value());
+        if (attr->value().isNull())
+            removeCSSProperty(CSSPropertyColor);
+        else
+            addCSSColor(CSSPropertyColor, attr->value());
     } else if (attr->name() == faceAttr) {
-        addCSSProperty(attr, CSSPropertyFontFamily, attr->value());
+        if (attr->value().isNull())
+            removeCSSProperty(CSSPropertyFontFamily);
+        else
+            addCSSProperty(CSSPropertyFontFamily, attr->value());
     } else
-        HTMLElement::parseMappedAttribute(attr);
+        HTMLElement::parseAttribute(attr);
 }
 
 }