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

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

Issue 203523002: Reland "Add plumbing for font-stretch" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: w/fix for ASSERT Created 6 years, 5 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
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 void setFontFamilyInherit(const FontDescription&); 56 void setFontFamilyInherit(const FontDescription&);
57 void setFontFamilyValue(CSSValue*); 57 void setFontFamilyValue(CSSValue*);
58 58
59 void setFontSizeInitial(); 59 void setFontSizeInitial();
60 void setFontSizeInherit(const FontDescription&); 60 void setFontSizeInherit(const FontDescription&);
61 void setFontSizeValue(CSSValue*, RenderStyle* parentStyle, const RenderStyle * rootElementStyle); 61 void setFontSizeValue(CSSValue*, RenderStyle* parentStyle, const RenderStyle * rootElementStyle);
62 62
63 void setWeight(FontWeight); 63 void setWeight(FontWeight);
64 void setWeightBolder(); 64 void setWeightBolder();
65 void setWeightLighter(); 65 void setWeightLighter();
66 void setStretch(FontStretch);
66 67
67 void setFontVariantLigaturesInitial(); 68 void setFontVariantLigaturesInitial();
68 void setFontVariantLigaturesInherit(const FontDescription&); 69 void setFontVariantLigaturesInherit(const FontDescription&);
69 void setFontVariantLigaturesValue(CSSValue*); 70 void setFontVariantLigaturesValue(CSSValue*);
70 71
71 void setFeatureSettingsNormal(); 72 void setFeatureSettingsNormal();
72 void setFeatureSettingsValue(CSSValue*); 73 void setFeatureSettingsValue(CSSValue*);
73 74
74 void setScript(const String& locale); 75 void setScript(const String& locale);
75 void setStyle(FontStyle); 76 void setStyle(FontStyle);
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 // is changed, FontBuilder tracks the need to update 127 // is changed, FontBuilder tracks the need to update
127 // style->font() with this bool. 128 // style->font() with this bool.
128 bool m_fontDirty; 129 bool m_fontDirty;
129 130
130 friend class FontBuilderTest; 131 friend class FontBuilderTest;
131 }; 132 };
132 133
133 } 134 }
134 135
135 #endif 136 #endif
OLDNEW
« no previous file with comments | « Source/core/css/resolver/AnimatedStyleBuilder.cpp ('k') | Source/core/css/resolver/FontBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698