diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
commit | 8d473cf9743f1d30a16a27114e93bd5af5648d23 (patch) | |
tree | cdca40d0353886b3ca52f33a2d7b8f1c0011aafc /Source/WebCore/html/HTMLFontElement.cpp | |
parent | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (diff) | |
download | qtwebkit-8d473cf9743f1d30a16a27114e93bd5af5648d23.tar.gz |
Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578)
Weekly snapshot
Diffstat (limited to 'Source/WebCore/html/HTMLFontElement.cpp')
-rw-r--r-- | Source/WebCore/html/HTMLFontElement.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/WebCore/html/HTMLFontElement.cpp b/Source/WebCore/html/HTMLFontElement.cpp index 9582fff7d..d6559d614 100644 --- a/Source/WebCore/html/HTMLFontElement.cpp +++ b/Source/WebCore/html/HTMLFontElement.cpp @@ -168,19 +168,19 @@ bool HTMLFontElement::isPresentationAttribute(const QualifiedName& name) const return HTMLElement::isPresentationAttribute(name); } -void HTMLFontElement::collectStyleForAttribute(Attribute* attr, StylePropertySet* style) +void HTMLFontElement::collectStyleForAttribute(const Attribute& attribute, StylePropertySet* style) { - if (attr->name() == sizeAttr) { + if (attribute.name() == sizeAttr) { int size = 0; - if (cssValueFromFontSizeNumber(attr->value(), size)) + if (cssValueFromFontSizeNumber(attribute.value(), size)) addPropertyToAttributeStyle(style, CSSPropertyFontSize, size); - } else if (attr->name() == colorAttr) - addHTMLColorToStyle(style, CSSPropertyColor, attr->value()); - else if (attr->name() == faceAttr) { - if (RefPtr<CSSValueList> fontFaceValue = cssValuePool().createFontFaceValue(attr->value())) + } else if (attribute.name() == colorAttr) + addHTMLColorToStyle(style, CSSPropertyColor, attribute.value()); + else if (attribute.name() == faceAttr) { + if (RefPtr<CSSValueList> fontFaceValue = cssValuePool().createFontFaceValue(attribute.value())) style->setProperty(CSSProperty(CSSPropertyFontFamily, fontFaceValue.release())); } else - HTMLElement::collectStyleForAttribute(attr, style); + HTMLElement::collectStyleForAttribute(attribute, style); } } |