| 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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 bool isSyntheticItalic() const { return m_syntheticItalic; } | 139 bool isSyntheticItalic() const { return m_syntheticItalic; } |
| 140 bool useSubpixelPositioning() const { return m_subpixelTextPosition; } | 140 bool useSubpixelPositioning() const { return m_subpixelTextPosition; } |
| 141 | 141 |
| 142 FontTraits traits() const; | 142 FontTraits traits() const; |
| 143 float wordSpacing() const { return m_wordSpacing; } | 143 float wordSpacing() const { return m_wordSpacing; } |
| 144 float letterSpacing() const { return m_letterSpacing; } | 144 float letterSpacing() const { return m_letterSpacing; } |
| 145 FontOrientation orientation() const { return static_cast<FontOrientation>(m_
orientation); } | 145 FontOrientation orientation() const { return static_cast<FontOrientation>(m_
orientation); } |
| 146 NonCJKGlyphOrientation nonCJKGlyphOrientation() const { return static_cast<N
onCJKGlyphOrientation>(m_nonCJKGlyphOrientation); } | 146 NonCJKGlyphOrientation nonCJKGlyphOrientation() const { return static_cast<N
onCJKGlyphOrientation>(m_nonCJKGlyphOrientation); } |
| 147 FontWidthVariant widthVariant() const { return static_cast<FontWidthVariant>
(m_widthVariant); } | 147 FontWidthVariant widthVariant() const { return static_cast<FontWidthVariant>
(m_widthVariant); } |
| 148 FontFeatureSettings* featureSettings() const { return m_featureSettings.get(
); } | 148 FontFeatureSettings* featureSettings() const { return m_featureSettings.get(
); } |
| 149 FontDescription makeNormalFeatureSettings() const; | |
| 150 | 149 |
| 151 float effectiveFontSize() const; // Returns either the computedSize or the c
omputedPixelSize | 150 float effectiveFontSize() const; // Returns either the computedSize or the c
omputedPixelSize |
| 152 FontCacheKey cacheKey(const FontFaceCreationParams&, FontTraits desiredTrait
s = FontTraits(0)) const; | 151 FontCacheKey cacheKey(const FontFaceCreationParams&, FontTraits desiredTrait
s = FontTraits(0)) const; |
| 153 | 152 |
| 154 void setFamily(const FontFamily& family) { m_familyList = family; } | 153 void setFamily(const FontFamily& family) { m_familyList = family; } |
| 155 void setComputedSize(float s) { m_computedSize = clampToFloat(s); } | 154 void setComputedSize(float s) { m_computedSize = clampToFloat(s); } |
| 156 void setSpecifiedSize(float s) { m_specifiedSize = clampToFloat(s); } | 155 void setSpecifiedSize(float s) { m_specifiedSize = clampToFloat(s); } |
| 157 void setStyle(FontStyle i) { m_style = i; } | 156 void setStyle(FontStyle i) { m_style = i; } |
| 158 void setVariant(FontVariant c) { m_variant = c; } | 157 void setVariant(FontVariant c) { m_variant = c; } |
| 159 void setVariantLigatures(const VariantLigatures&); | 158 void setVariantLigatures(const VariantLigatures&); |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 && m_script == other.m_script | 263 && m_script == other.m_script |
| 265 && m_syntheticBold == other.m_syntheticBold | 264 && m_syntheticBold == other.m_syntheticBold |
| 266 && m_syntheticItalic == other.m_syntheticItalic | 265 && m_syntheticItalic == other.m_syntheticItalic |
| 267 && m_featureSettings == other.m_featureSettings | 266 && m_featureSettings == other.m_featureSettings |
| 268 && m_subpixelTextPosition == other.m_subpixelTextPosition; | 267 && m_subpixelTextPosition == other.m_subpixelTextPosition; |
| 269 } | 268 } |
| 270 | 269 |
| 271 } | 270 } |
| 272 | 271 |
| 273 #endif | 272 #endif |
| OLD | NEW |