| 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 13 matching lines...) Expand all Loading... |
| 24 | 24 |
| 25 #include "core/CSSPropertyNames.h" | 25 #include "core/CSSPropertyNames.h" |
| 26 #include "core/CSSValueKeywords.h" | 26 #include "core/CSSValueKeywords.h" |
| 27 #include "core/HTMLNames.h" | 27 #include "core/HTMLNames.h" |
| 28 #include "core/css/CSSValueList.h" | 28 #include "core/css/CSSValueList.h" |
| 29 #include "core/css/CSSValuePool.h" | 29 #include "core/css/CSSValuePool.h" |
| 30 #include "core/css/StylePropertySet.h" | 30 #include "core/css/StylePropertySet.h" |
| 31 #include "core/css/parser/CSSParser.h" | 31 #include "core/css/parser/CSSParser.h" |
| 32 #include "core/html/parser/HTMLParserIdioms.h" | 32 #include "core/html/parser/HTMLParserIdioms.h" |
| 33 #include "wtf/text/StringBuilder.h" | 33 #include "wtf/text/StringBuilder.h" |
| 34 #include "wtf/text/StringToNumber.h" |
| 34 | 35 |
| 35 using namespace WTF; | 36 using namespace WTF; |
| 36 | 37 |
| 37 namespace blink { | 38 namespace blink { |
| 38 | 39 |
| 39 using namespace HTMLNames; | 40 using namespace HTMLNames; |
| 40 | 41 |
| 41 inline HTMLFontElement::HTMLFontElement(Document& document) | 42 inline HTMLFontElement::HTMLFontElement(Document& document) |
| 42 : HTMLElement(fontTag, document) | 43 : HTMLElement(fontTag, document) |
| 43 { | 44 { |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 addHTMLColorToStyle(style, CSSPropertyColor, value); | 202 addHTMLColorToStyle(style, CSSPropertyColor, value); |
| 202 } else if (name == faceAttr && !value.isEmpty()) { | 203 } else if (name == faceAttr && !value.isEmpty()) { |
| 203 if (CSSValueList* fontFaceValue = createFontFaceValueWithPool(value)) | 204 if (CSSValueList* fontFaceValue = createFontFaceValueWithPool(value)) |
| 204 style->setProperty(CSSProperty(CSSPropertyFontFamily, *fontFaceValue
)); | 205 style->setProperty(CSSProperty(CSSPropertyFontFamily, *fontFaceValue
)); |
| 205 } else { | 206 } else { |
| 206 HTMLElement::collectStyleForPresentationAttribute(name, value, style); | 207 HTMLElement::collectStyleForPresentationAttribute(name, value, style); |
| 207 } | 208 } |
| 208 } | 209 } |
| 209 | 210 |
| 210 } // namespace blink | 211 } // namespace blink |
| OLD | NEW |