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

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

Issue 204963002: Clean up setting font-family: initial value. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | « no previous file | 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 FontDescription::GenericFamilyType initialGenericFamily() { return Fo ntDescription::NoFamily; }
93 static TextRenderingMode initialTextRendering() { return AutoTextRendering; } 94 static TextRenderingMode initialTextRendering() { return AutoTextRendering; }
94 static FontVariant initialVariant() { return FontVariantNormal; } 95 static FontVariant initialVariant() { return FontVariantNormal; }
95 static FontStyle initialStyle() { return FontStyleNormal; } 96 static FontStyle initialStyle() { return FontStyleNormal; }
96 static FontDescription::Kerning initialKerning() { return FontDescription::A utoKerning; } 97 static FontDescription::Kerning initialKerning() { return FontDescription::A utoKerning; }
97 static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; } 98 static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; }
98 99
99 friend class FontDescriptionChangeScope; 100 friend class FontDescriptionChangeScope;
100 101
101 private: 102 private:
102 103
(...skipping 22 matching lines...) Expand all
125 // is changed, FontBuilder tracks the need to update 126 // is changed, FontBuilder tracks the need to update
126 // style->font() with this bool. 127 // style->font() with this bool.
127 bool m_fontDirty; 128 bool m_fontDirty;
128 129
129 friend class FontBuilderTest; 130 friend class FontBuilderTest;
130 }; 131 };
131 132
132 } 133 }
133 134
134 #endif 135 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/resolver/FontBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698