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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 { | 136 { |
137 if (input.isEmpty()) | 137 if (input.isEmpty()) |
138 return false; | 138 return false; |
139 | 139 |
140 if (input.is8Bit()) | 140 if (input.is8Bit()) |
141 return parseFontSize(input.characters8(), input.length(), size); | 141 return parseFontSize(input.characters8(), input.length(), size); |
142 | 142 |
143 return parseFontSize(input.characters16(), input.length(), size); | 143 return parseFontSize(input.characters16(), input.length(), size); |
144 } | 144 } |
145 | 145 |
146 bool HTMLFontElement::cssValueFromFontSizeNumber(const String& s, int& size) | 146 bool HTMLFontElement::cssValueFromFontSizeNumber(const String& s, CSSValueID& si
ze) |
147 { | 147 { |
148 int num = 0; | 148 int num = 0; |
149 if (!parseFontSize(s, num)) | 149 if (!parseFontSize(s, num)) |
150 return false; | 150 return false; |
151 | 151 |
152 switch (num) { | 152 switch (num) { |
153 case 1: | 153 case 1: |
154 // FIXME: The spec says that we're supposed to use CSSValueXxSmall here. | 154 // FIXME: The spec says that we're supposed to use CSSValueXxSmall here. |
155 size = CSSValueXSmall; | 155 size = CSSValueXSmall; |
156 break; | 156 break; |
(...skipping 24 matching lines...) Expand all Loading... |
181 bool HTMLFontElement::isPresentationAttribute(const QualifiedName& name) const | 181 bool HTMLFontElement::isPresentationAttribute(const QualifiedName& name) const |
182 { | 182 { |
183 if (name == sizeAttr || name == colorAttr || name == faceAttr) | 183 if (name == sizeAttr || name == colorAttr || name == faceAttr) |
184 return true; | 184 return true; |
185 return HTMLElement::isPresentationAttribute(name); | 185 return HTMLElement::isPresentationAttribute(name); |
186 } | 186 } |
187 | 187 |
188 void HTMLFontElement::collectStyleForPresentationAttribute(const QualifiedName&
name, const AtomicString& value, MutableStylePropertySet* style) | 188 void HTMLFontElement::collectStyleForPresentationAttribute(const QualifiedName&
name, const AtomicString& value, MutableStylePropertySet* style) |
189 { | 189 { |
190 if (name == sizeAttr) { | 190 if (name == sizeAttr) { |
191 int size = 0; | 191 CSSValueID size = CSSValueInvalid; |
192 if (cssValueFromFontSizeNumber(value, size)) | 192 if (cssValueFromFontSizeNumber(value, size)) |
193 addPropertyToPresentationAttributeStyle(style, CSSPropertyFontSize,
size); | 193 addPropertyToPresentationAttributeStyle(style, CSSPropertyFontSize,
size); |
194 } else if (name == colorAttr) | 194 } else if (name == colorAttr) |
195 addHTMLColorToStyle(style, CSSPropertyColor, value); | 195 addHTMLColorToStyle(style, CSSPropertyColor, value); |
196 else if (name == faceAttr) { | 196 else if (name == faceAttr) { |
197 if (RefPtr<CSSValueList> fontFaceValue = cssValuePool().createFontFaceVa
lue(value)) | 197 if (RefPtr<CSSValueList> fontFaceValue = cssValuePool().createFontFaceVa
lue(value)) |
198 style->setProperty(CSSProperty(CSSPropertyFontFamily, fontFaceValue.
release())); | 198 style->setProperty(CSSProperty(CSSPropertyFontFamily, fontFaceValue.
release())); |
199 } else | 199 } else |
200 HTMLElement::collectStyleForPresentationAttribute(name, value, style); | 200 HTMLElement::collectStyleForPresentationAttribute(name, value, style); |
201 } | 201 } |
202 | 202 |
203 } | 203 } |
OLD | NEW |