OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2000 Simon Hausmann <hausmann@kde.org> | 4 * (C) 2000 Simon Hausmann <hausmann@kde.org> |
5 * Copyright (C) 2003, 2006, 2008, 2010 Apple Inc. All rights reserved. | 5 * Copyright (C) 2003, 2006, 2008, 2010 Apple Inc. All rights reserved. |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 } | 181 } |
182 | 182 |
183 void HTMLFontElement::collectStyleForPresentationAttribute(const QualifiedName&
name, const AtomicString& value, MutableStylePropertySet* style) | 183 void HTMLFontElement::collectStyleForPresentationAttribute(const QualifiedName&
name, const AtomicString& value, MutableStylePropertySet* style) |
184 { | 184 { |
185 if (name == sizeAttr) { | 185 if (name == sizeAttr) { |
186 CSSValueID size = CSSValueInvalid; | 186 CSSValueID size = CSSValueInvalid; |
187 if (cssValueFromFontSizeNumber(value, size)) | 187 if (cssValueFromFontSizeNumber(value, size)) |
188 addPropertyToPresentationAttributeStyle(style, CSSPropertyFontSize,
size); | 188 addPropertyToPresentationAttributeStyle(style, CSSPropertyFontSize,
size); |
189 } else if (name == colorAttr) | 189 } else if (name == colorAttr) |
190 addHTMLColorToStyle(style, CSSPropertyColor, value); | 190 addHTMLColorToStyle(style, CSSPropertyColor, value); |
191 else if (name == faceAttr) { | 191 else if (name == faceAttr && !value.isEmpty()) { |
192 if (RefPtrWillBeRawPtr<CSSValueList> fontFaceValue = cssValuePool().crea
teFontFaceValue(value)) | 192 if (RefPtrWillBeRawPtr<CSSValueList> fontFaceValue = cssValuePool().crea
teFontFaceValue(value)) |
193 style->setProperty(CSSProperty(CSSPropertyFontFamily, fontFaceValue.
release())); | 193 style->setProperty(CSSProperty(CSSPropertyFontFamily, fontFaceValue.
release())); |
194 } else | 194 } else |
195 HTMLElement::collectStyleForPresentationAttribute(name, value, style); | 195 HTMLElement::collectStyleForPresentationAttribute(name, value, style); |
196 } | 196 } |
197 | 197 |
198 } | 198 } |
OLD | NEW |