| 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. |
| 11 * | 11 * |
| 12 * This library is distributed in the hope that it will be useful, | 12 * This library is distributed in the hope that it will be useful, |
| 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 15 * Library General Public License for more details. | 15 * Library General Public License for more details. |
| 16 * | 16 * |
| 17 * You should have received a copy of the GNU Library General Public License | 17 * You should have received a copy of the GNU Library General Public License |
| 18 * along with this library; see the file COPYING.LIB. If not, write to | 18 * along with this library; see the file COPYING.LIB. If not, write to |
| 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 20 * Boston, MA 02110-1301, USA. | 20 * Boston, MA 02110-1301, USA. |
| 21 */ | 21 */ |
| 22 | 22 |
| 23 #include "config.h" | 23 #include "config.h" |
| 24 #include "core/html/HTMLFontElement.h" | 24 #include "core/html/HTMLFontElement.h" |
| 25 | 25 |
| 26 #include "CSSPropertyNames.h" | 26 #include "core/CSSPropertyNames.h" |
| 27 #include "CSSValueKeywords.h" | 27 #include "core/CSSValueKeywords.h" |
| 28 #include "HTMLNames.h" | 28 #include "core/HTMLNames.h" |
| 29 #include "core/css/CSSValueList.h" | 29 #include "core/css/CSSValueList.h" |
| 30 #include "core/css/CSSValuePool.h" | 30 #include "core/css/CSSValuePool.h" |
| 31 #include "core/css/StylePropertySet.h" | 31 #include "core/css/StylePropertySet.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 | 34 |
| 35 using namespace WTF; | 35 using namespace WTF; |
| 36 | 36 |
| 37 namespace WebCore { | 37 namespace WebCore { |
| 38 | 38 |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 } else if (name == colorAttr) | 190 } else if (name == colorAttr) |
| 191 addHTMLColorToStyle(style, CSSPropertyColor, value); | 191 addHTMLColorToStyle(style, CSSPropertyColor, value); |
| 192 else if (name == faceAttr) { | 192 else if (name == faceAttr) { |
| 193 if (RefPtrWillBeRawPtr<CSSValueList> fontFaceValue = cssValuePool().crea
teFontFaceValue(value)) | 193 if (RefPtrWillBeRawPtr<CSSValueList> fontFaceValue = cssValuePool().crea
teFontFaceValue(value)) |
| 194 style->setProperty(CSSProperty(CSSPropertyFontFamily, fontFaceValue.
release())); | 194 style->setProperty(CSSProperty(CSSPropertyFontFamily, fontFaceValue.
release())); |
| 195 } else | 195 } else |
| 196 HTMLElement::collectStyleForPresentationAttribute(name, value, style); | 196 HTMLElement::collectStyleForPresentationAttribute(name, value, style); |
| 197 } | 197 } |
| 198 | 198 |
| 199 } | 199 } |
| OLD | NEW |