Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Side by Side Diff: Source/core/css/resolver/FontBuilder.h

Issue 447443003: Remove custom style building for font-variant-ligatures. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/resolver/FontBuilder.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * Copyright (C) 2013 Google Inc. All rights reserved. 4 * Copyright (C) 2013 Google Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 59
60 void setFontSizeInitial(); 60 void setFontSizeInitial();
61 void setFontSizeInherit(const FontDescription&); 61 void setFontSizeInherit(const FontDescription&);
62 void setFontSizeValue(CSSValue*, RenderStyle* parentStyle, const RenderStyle * rootElementStyle); 62 void setFontSizeValue(CSSValue*, RenderStyle* parentStyle, const RenderStyle * rootElementStyle);
63 63
64 void setWeight(FontWeight); 64 void setWeight(FontWeight);
65 void setWeightBolder(); 65 void setWeightBolder();
66 void setWeightLighter(); 66 void setWeightLighter();
67 void setStretch(FontStretch); 67 void setStretch(FontStretch);
68 68
69 void setFontVariantLigaturesInitial();
70 void setFontVariantLigaturesInherit(const FontDescription&);
71 void setFontVariantLigaturesValue(CSSValue*);
72
73 void setFeatureSettingsNormal(); 69 void setFeatureSettingsNormal();
74 void setFeatureSettingsValue(CSSValue*); 70 void setFeatureSettingsValue(CSSValue*);
75 71
76 void setScript(const String& locale); 72 void setScript(const String& locale);
77 void setStyle(FontStyle); 73 void setStyle(FontStyle);
78 void setVariant(FontVariant); 74 void setVariant(FontVariant);
75 void setVariantLigatures(const FontDescription::VariantLigatures&);
79 void setTextRendering(TextRenderingMode); 76 void setTextRendering(TextRenderingMode);
80 void setKerning(FontDescription::Kerning); 77 void setKerning(FontDescription::Kerning);
81 void setFontSmoothing(FontSmoothingMode); 78 void setFontSmoothing(FontSmoothingMode);
82 79
83 // FIXME: These need to just vend a Font object eventually. 80 // FIXME: These need to just vend a Font object eventually.
84 void createFont(PassRefPtrWillBeRawPtr<FontSelector>, const RenderStyle* par entStyle, RenderStyle*); 81 void createFont(PassRefPtrWillBeRawPtr<FontSelector>, const RenderStyle* par entStyle, RenderStyle*);
85 // FIXME: This is nearly static, should either made fully static or decompos ed into 82 // FIXME: This is nearly static, should either made fully static or decompos ed into
86 // FontBuilder calls at the callsite. 83 // FontBuilder calls at the callsite.
87 void createFontForDocument(PassRefPtrWillBeRawPtr<FontSelector>, RenderStyle *); 84 void createFontForDocument(PassRefPtrWillBeRawPtr<FontSelector>, RenderStyle *);
88 85
89 bool fontSizeHasViewportUnits() { return m_fontSizehasViewportUnits; } 86 bool fontSizeHasViewportUnits() { return m_fontSizehasViewportUnits; }
90 87
91 // FIXME: These should not be necessary eventually. 88 // FIXME: These should not be necessary eventually.
92 void setFontDirty(bool fontDirty) { m_fontDirty = fontDirty; } 89 void setFontDirty(bool fontDirty) { m_fontDirty = fontDirty; }
93 // FIXME: This is only used by an ASSERT in StyleResolver. Remove? 90 // FIXME: This is only used by an ASSERT in StyleResolver. Remove?
94 bool fontDirty() const { return m_fontDirty; } 91 bool fontDirty() const { return m_fontDirty; }
95 92
96 static FontDescription::GenericFamilyType initialGenericFamily() { return Fo ntDescription::NoFamily; } 93 static FontDescription::GenericFamilyType initialGenericFamily() { return Fo ntDescription::NoFamily; }
97 static TextRenderingMode initialTextRendering() { return AutoTextRendering; } 94 static TextRenderingMode initialTextRendering() { return AutoTextRendering; }
98 static FontVariant initialVariant() { return FontVariantNormal; } 95 static FontVariant initialVariant() { return FontVariantNormal; }
96 static FontDescription::VariantLigatures initialVariantLigatures() { return FontDescription::VariantLigatures(); }
99 static FontStyle initialStyle() { return FontStyleNormal; } 97 static FontStyle initialStyle() { return FontStyleNormal; }
100 static FontDescription::Kerning initialKerning() { return FontDescription::A utoKerning; } 98 static FontDescription::Kerning initialKerning() { return FontDescription::A utoKerning; }
101 static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; } 99 static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; }
102 static FontStretch initialStretch() { return FontStretchNormal; } 100 static FontStretch initialStretch() { return FontStretchNormal; }
103 101
104 friend class FontDescriptionChangeScope; 102 friend class FontDescriptionChangeScope;
105 103
106 private: 104 private:
107 105
108 // FIXME: "size" arg should be first for consistency with other similar func tions. 106 // FIXME: "size" arg should be first for consistency with other similar func tions.
(...skipping 20 matching lines...) Expand all
129 // is changed, FontBuilder tracks the need to update 127 // is changed, FontBuilder tracks the need to update
130 // style->font() with this bool. 128 // style->font() with this bool.
131 bool m_fontDirty; 129 bool m_fontDirty;
132 130
133 friend class FontBuilderTest; 131 friend class FontBuilderTest;
134 }; 132 };
135 133
136 } 134 }
137 135
138 #endif 136 #endif
OLDNEW
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/resolver/FontBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698