| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. | 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. |
| 4 * All rights reserved. | 4 * All rights reserved. |
| 5 * Copyright (C) 2013 Google Inc. All rights reserved. | 5 * Copyright (C) 2013 Google 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 void setFamilyDescription(const FontDescription::FamilyDescription&); | 63 void setFamilyDescription(const FontDescription::FamilyDescription&); |
| 64 void setFeatureSettings(PassRefPtr<FontFeatureSettings>); | 64 void setFeatureSettings(PassRefPtr<FontFeatureSettings>); |
| 65 void setLocale(PassRefPtr<const LayoutLocale>); | 65 void setLocale(PassRefPtr<const LayoutLocale>); |
| 66 void setStyle(FontStyle); | 66 void setStyle(FontStyle); |
| 67 void setVariantCaps(FontDescription::FontVariantCaps); | 67 void setVariantCaps(FontDescription::FontVariantCaps); |
| 68 void setVariantLigatures(const FontDescription::VariantLigatures&); | 68 void setVariantLigatures(const FontDescription::VariantLigatures&); |
| 69 void setVariantNumeric(const FontVariantNumeric&); | 69 void setVariantNumeric(const FontVariantNumeric&); |
| 70 void setTextRendering(TextRenderingMode); | 70 void setTextRendering(TextRenderingMode); |
| 71 void setKerning(FontDescription::Kerning); | 71 void setKerning(FontDescription::Kerning); |
| 72 void setFontSmoothing(FontSmoothingMode); | 72 void setFontSmoothing(FontSmoothingMode); |
| 73 void setVariationSettings(PassRefPtr<FontVariationSettings>); |
| 73 | 74 |
| 74 // FIXME: These need to just vend a Font object eventually. | 75 // FIXME: These need to just vend a Font object eventually. |
| 75 void createFont(FontSelector*, ComputedStyle&); | 76 void createFont(FontSelector*, ComputedStyle&); |
| 76 | 77 |
| 77 void createFontForDocument(FontSelector*, ComputedStyle&); | 78 void createFontForDocument(FontSelector*, ComputedStyle&); |
| 78 | 79 |
| 79 bool fontDirty() const { return m_flags; } | 80 bool fontDirty() const { return m_flags; } |
| 80 | 81 |
| 81 static FontDescription::FamilyDescription initialFamilyDescription() { | 82 static FontDescription::FamilyDescription initialFamilyDescription() { |
| 82 return FontDescription::FamilyDescription(initialGenericFamily()); | 83 return FontDescription::FamilyDescription(initialGenericFamily()); |
| 83 } | 84 } |
| 84 static FontFeatureSettings* initialFeatureSettings() { return nullptr; } | 85 static FontFeatureSettings* initialFeatureSettings() { return nullptr; } |
| 86 static FontVariationSettings* initialVariationSettings() { return nullptr; } |
| 85 static FontDescription::GenericFamilyType initialGenericFamily() { | 87 static FontDescription::GenericFamilyType initialGenericFamily() { |
| 86 return FontDescription::StandardFamily; | 88 return FontDescription::StandardFamily; |
| 87 } | 89 } |
| 88 static FontDescription::Size initialSize() { | 90 static FontDescription::Size initialSize() { |
| 89 return FontDescription::Size(FontSize::initialKeywordSize(), 0.0f, false); | 91 return FontDescription::Size(FontSize::initialKeywordSize(), 0.0f, false); |
| 90 } | 92 } |
| 91 static float initialSizeAdjust() { return FontSizeAdjustNone; } | 93 static float initialSizeAdjust() { return FontSizeAdjustNone; } |
| 92 static TextRenderingMode initialTextRendering() { return AutoTextRendering; } | 94 static TextRenderingMode initialTextRendering() { return AutoTextRendering; } |
| 93 static FontDescription::FontVariantCaps initialVariantCaps() { | 95 static FontDescription::FontVariantCaps initialVariantCaps() { |
| 94 return FontDescription::CapsNormal; | 96 return FontDescription::CapsNormal; |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 Size, | 136 Size, |
| 135 Stretch, | 137 Stretch, |
| 136 Family, | 138 Family, |
| 137 FeatureSettings, | 139 FeatureSettings, |
| 138 Locale, | 140 Locale, |
| 139 Style, | 141 Style, |
| 140 SizeAdjust, | 142 SizeAdjust, |
| 141 VariantCaps, | 143 VariantCaps, |
| 142 VariantLigatures, | 144 VariantLigatures, |
| 143 VariantNumeric, | 145 VariantNumeric, |
| 146 VariationSettings, |
| 144 TextRendering, | 147 TextRendering, |
| 145 Kerning, | 148 Kerning, |
| 146 FontSmoothing, | 149 FontSmoothing, |
| 147 | 150 |
| 148 EffectiveZoom, | 151 EffectiveZoom, |
| 149 TextOrientation, | 152 TextOrientation, |
| 150 WritingMode | 153 WritingMode |
| 151 }; | 154 }; |
| 152 | 155 |
| 153 void set(PropertySetFlag flag) { m_flags |= (1 << unsigned(flag)); } | 156 void set(PropertySetFlag flag) { m_flags |= (1 << unsigned(flag)); } |
| 154 bool isSet(PropertySetFlag flag) const { | 157 bool isSet(PropertySetFlag flag) const { |
| 155 return m_flags & (1 << unsigned(flag)); | 158 return m_flags & (1 << unsigned(flag)); |
| 156 } | 159 } |
| 157 | 160 |
| 158 unsigned m_flags; | 161 unsigned m_flags; |
| 159 }; | 162 }; |
| 160 | 163 |
| 161 } // namespace blink | 164 } // namespace blink |
| 162 | 165 |
| 163 #endif | 166 #endif |
| OLD | NEW |