| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) | 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv
ed. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv
ed. |
| 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> | 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 FontTraits traits() const; | 120 FontTraits traits() const; |
| 121 float wordSpacing() const { return m_wordSpacing; } | 121 float wordSpacing() const { return m_wordSpacing; } |
| 122 float letterSpacing() const { return m_letterSpacing; } | 122 float letterSpacing() const { return m_letterSpacing; } |
| 123 FontOrientation orientation() const { return static_cast<FontOrientation>(m_
orientation); } | 123 FontOrientation orientation() const { return static_cast<FontOrientation>(m_
orientation); } |
| 124 NonCJKGlyphOrientation nonCJKGlyphOrientation() const { return static_cast<N
onCJKGlyphOrientation>(m_nonCJKGlyphOrientation); } | 124 NonCJKGlyphOrientation nonCJKGlyphOrientation() const { return static_cast<N
onCJKGlyphOrientation>(m_nonCJKGlyphOrientation); } |
| 125 FontWidthVariant widthVariant() const { return static_cast<FontWidthVariant>
(m_widthVariant); } | 125 FontWidthVariant widthVariant() const { return static_cast<FontWidthVariant>
(m_widthVariant); } |
| 126 FontFeatureSettings* featureSettings() const { return m_featureSettings.get(
); } | 126 FontFeatureSettings* featureSettings() const { return m_featureSettings.get(
); } |
| 127 FontDescription makeNormalFeatureSettings() const; | 127 FontDescription makeNormalFeatureSettings() const; |
| 128 | 128 |
| 129 float effectiveFontSize() const; // Returns either the computedSize or the c
omputedPixelSize | 129 float effectiveFontSize() const; // Returns either the computedSize or the c
omputedPixelSize |
| 130 FontCacheKey cacheKey(const AtomicString& familyName, FontTraits desiredTrai
ts = FontTraits(0)) const; | 130 FontCacheKey cacheKey(const FontFaceCreationParams&, FontTraits desiredTrait
s = FontTraits(0)) const; |
| 131 | 131 |
| 132 void setFamily(const FontFamily& family) { m_familyList = family; } | 132 void setFamily(const FontFamily& family) { m_familyList = family; } |
| 133 void setComputedSize(float s) { m_computedSize = clampToFloat(s); } | 133 void setComputedSize(float s) { m_computedSize = clampToFloat(s); } |
| 134 void setSpecifiedSize(float s) { m_specifiedSize = clampToFloat(s); } | 134 void setSpecifiedSize(float s) { m_specifiedSize = clampToFloat(s); } |
| 135 void setStyle(FontStyle i) { m_style = i; } | 135 void setStyle(FontStyle i) { m_style = i; } |
| 136 void setVariant(FontVariant c) { m_variant = c; } | 136 void setVariant(FontVariant c) { m_variant = c; } |
| 137 void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; } | 137 void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; } |
| 138 void setWeight(FontWeight w) { m_weight = w; } | 138 void setWeight(FontWeight w) { m_weight = w; } |
| 139 void setStretch(FontStretch s) { m_stretch = s; } | 139 void setStretch(FontStretch s) { m_stretch = s; } |
| 140 void setGenericFamily(GenericFamilyType genericFamily) { m_genericFamily = g
enericFamily; } | 140 void setGenericFamily(GenericFamilyType genericFamily) { m_genericFamily = g
enericFamily; } |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 && m_script == other.m_script | 245 && m_script == other.m_script |
| 246 && m_syntheticBold == other.m_syntheticBold | 246 && m_syntheticBold == other.m_syntheticBold |
| 247 && m_syntheticItalic == other.m_syntheticItalic | 247 && m_syntheticItalic == other.m_syntheticItalic |
| 248 && m_featureSettings == other.m_featureSettings | 248 && m_featureSettings == other.m_featureSettings |
| 249 && m_subpixelTextPosition == other.m_subpixelTextPosition; | 249 && m_subpixelTextPosition == other.m_subpixelTextPosition; |
| 250 } | 250 } |
| 251 | 251 |
| 252 } | 252 } |
| 253 | 253 |
| 254 #endif | 254 #endif |
| OLD | NEW |