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

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

Issue 186403002: Make font-related CSS properties less custom. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Addressed comments. Created 6 years, 9 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 | Annotate | Revision Log
« 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 void setFontVariantLigaturesInitial(); 66 void setFontVariantLigaturesInitial();
67 void setFontVariantLigaturesInherit(const FontDescription&); 67 void setFontVariantLigaturesInherit(const FontDescription&);
68 void setFontVariantLigaturesValue(CSSValue*); 68 void setFontVariantLigaturesValue(CSSValue*);
69 69
70 void setFeatureSettingsNormal(); 70 void setFeatureSettingsNormal();
71 void setFeatureSettingsValue(CSSValue*); 71 void setFeatureSettingsValue(CSSValue*);
72 72
73 void setScript(const String& locale); 73 void setScript(const String& locale);
74 void setItalic(FontItalic); 74 void setItalic(FontItalic);
75 void setSmallCaps(FontSmallCaps); 75 void setSmallCaps(FontSmallCaps);
76 void setTextRenderingMode(TextRenderingMode); 76 void setTextRendering(TextRenderingMode);
77 void setKerning(FontDescription::Kerning); 77 void setKerning(FontDescription::Kerning);
78 void setFontSmoothing(FontSmoothingMode); 78 void setFontSmoothing(FontSmoothingMode);
79 79
80 // FIXME: These need to just vend a Font object eventually. 80 // FIXME: These need to just vend a Font object eventually.
81 void createFont(PassRefPtr<FontSelector>, const RenderStyle* parentStyle, Re nderStyle*); 81 void createFont(PassRefPtr<FontSelector>, const RenderStyle* parentStyle, Re nderStyle*);
82 // 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
83 // FontBuilder calls at the callsite. 83 // FontBuilder calls at the callsite.
84 void createFontForDocument(PassRefPtr<FontSelector>, RenderStyle*); 84 void createFontForDocument(PassRefPtr<FontSelector>, RenderStyle*);
85 85
86 bool fontSizeHasViewportUnits() { return m_fontSizehasViewportUnits; } 86 bool fontSizeHasViewportUnits() { return m_fontSizehasViewportUnits; }
87 87
88 // FIXME: These should not be necessary eventually. 88 // FIXME: These should not be necessary eventually.
89 void setFontDirty(bool fontDirty) { m_fontDirty = fontDirty; } 89 void setFontDirty(bool fontDirty) { m_fontDirty = fontDirty; }
90 // FIXME: This is only used by an ASSERT in StyleResolver. Remove? 90 // FIXME: This is only used by an ASSERT in StyleResolver. Remove?
91 bool fontDirty() const { return m_fontDirty; } 91 bool fontDirty() const { return m_fontDirty; }
92 92
93 static TextRenderingMode initialTextRendering() { return AutoTextRendering; }
94 static FontSmallCaps initialSmallCaps() { return FontSmallCapsOff; }
95 static FontItalic initialItalic() { return FontItalicOff; }
96 static FontDescription::Kerning initialKerning() { return FontDescription::A utoKerning; }
97 static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; }
98
93 friend class FontDescriptionChangeScope; 99 friend class FontDescriptionChangeScope;
100
94 private: 101 private:
95 102
96 // FIXME: "size" arg should be first for consistency with other similar func tions. 103 // FIXME: "size" arg should be first for consistency with other similar func tions.
97 void setSize(FontDescription&, float effectiveZoom, float size); 104 void setSize(FontDescription&, float effectiveZoom, float size);
98 void checkForOrientationChange(RenderStyle*); 105 void checkForOrientationChange(RenderStyle*);
99 // This function fixes up the default font size if it detects that the curre nt generic font family has changed. -dwh 106 // This function fixes up the default font size if it detects that the curre nt generic font family has changed. -dwh
100 void checkForGenericFamilyChange(RenderStyle*, const RenderStyle* parentStyl e); 107 void checkForGenericFamilyChange(RenderStyle*, const RenderStyle* parentStyl e);
101 void checkForZoomChange(RenderStyle*, const RenderStyle* parentStyle); 108 void checkForZoomChange(RenderStyle*, const RenderStyle* parentStyle);
102 109
103 float getComputedSizeFromSpecifiedSize(FontDescription&, float effectiveZoom , float specifiedSize); 110 float getComputedSizeFromSpecifiedSize(FontDescription&, float effectiveZoom , float specifiedSize);
(...skipping 12 matching lines...) Expand all
116 // object on RenderStyle from various other font-related 123 // object on RenderStyle from various other font-related
117 // properties on RenderStyle. Whenever one of those 124 // properties on RenderStyle. Whenever one of those
118 // is changed, FontBuilder tracks the need to update 125 // is changed, FontBuilder tracks the need to update
119 // style->font() with this bool. 126 // style->font() with this bool.
120 bool m_fontDirty; 127 bool m_fontDirty;
121 }; 128 };
122 129
123 } 130 }
124 131
125 #endif 132 #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