| OLD | NEW |
| 1 /** | 1 /** |
| 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) | 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. | 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 13 * Library General Public License for more details. | 13 * Library General Public License for more details. |
| 14 * | 14 * |
| 15 * You should have received a copy of the GNU Library General Public License | 15 * You should have received a copy of the GNU Library General Public License |
| 16 * along with this library; see the file COPYING.LIB. If not, write to | 16 * along with this library; see the file COPYING.LIB. If not, write to |
| 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 18 * Boston, MA 02110-1301, USA. | 18 * Boston, MA 02110-1301, USA. |
| 19 */ | 19 */ |
| 20 #include "config.h" | 20 #include "config.h" |
| 21 #include "core/css/FontValue.h" | 21 #include "core/css/CSSFontValue.h" |
| 22 | 22 |
| 23 #include "core/css/CSSPrimitiveValue.h" | 23 #include "core/css/CSSPrimitiveValue.h" |
| 24 #include "core/css/CSSValueList.h" | 24 #include "core/css/CSSValueList.h" |
| 25 #include "wtf/text/StringBuilder.h" | 25 #include "wtf/text/StringBuilder.h" |
| 26 | 26 |
| 27 namespace WebCore { | 27 namespace WebCore { |
| 28 | 28 |
| 29 String FontValue::customCssText() const | 29 String CSSFontValue::customCssText() const |
| 30 { | 30 { |
| 31 // font variant weight size / line-height family | 31 // font variant weight size / line-height family |
| 32 | 32 |
| 33 StringBuilder result; | 33 StringBuilder result; |
| 34 | 34 |
| 35 if (style) | 35 if (style) |
| 36 result.append(style->cssText()); | 36 result.append(style->cssText()); |
| 37 if (variant) { | 37 if (variant) { |
| 38 if (!result.isEmpty()) | 38 if (!result.isEmpty()) |
| 39 result.append(' '); | 39 result.append(' '); |
| (...skipping 17 matching lines...) Expand all Loading... |
| 57 } | 57 } |
| 58 if (family) { | 58 if (family) { |
| 59 if (!result.isEmpty()) | 59 if (!result.isEmpty()) |
| 60 result.append(' '); | 60 result.append(' '); |
| 61 result.append(family->cssText()); | 61 result.append(family->cssText()); |
| 62 } | 62 } |
| 63 | 63 |
| 64 return result.toString(); | 64 return result.toString(); |
| 65 } | 65 } |
| 66 | 66 |
| 67 bool FontValue::equals(const FontValue& other) const | 67 bool CSSFontValue::equals(const CSSFontValue& other) const |
| 68 { | 68 { |
| 69 return compareCSSValuePtr(style, other.style) | 69 return compareCSSValuePtr(style, other.style) |
| 70 && compareCSSValuePtr(variant, other.variant) | 70 && compareCSSValuePtr(variant, other.variant) |
| 71 && compareCSSValuePtr(weight, other.weight) | 71 && compareCSSValuePtr(weight, other.weight) |
| 72 && compareCSSValuePtr(size, other.size) | 72 && compareCSSValuePtr(size, other.size) |
| 73 && compareCSSValuePtr(lineHeight, other.lineHeight) | 73 && compareCSSValuePtr(lineHeight, other.lineHeight) |
| 74 && compareCSSValuePtr(family, other.family); | 74 && compareCSSValuePtr(family, other.family); |
| 75 } | 75 } |
| 76 | 76 |
| 77 } | 77 } |
| OLD | NEW |