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

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

Issue 195823006: Revert 169264 "Add plumbing for font-stretch" (Closed) Base URL: svn://svn.chromium.org/blink/
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
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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 void setFontFamilyInherit(const FontDescription&); 55 void setFontFamilyInherit(const FontDescription&);
56 void setFontFamilyValue(CSSValue*, float effectiveZoom); 56 void setFontFamilyValue(CSSValue*, float effectiveZoom);
57 57
58 void setFontSizeInitial(float effectiveZoom); 58 void setFontSizeInitial(float effectiveZoom);
59 void setFontSizeInherit(const FontDescription&, float effectiveZoom); 59 void setFontSizeInherit(const FontDescription&, float effectiveZoom);
60 void setFontSizeValue(CSSValue*, RenderStyle* parentStyle, const RenderStyle * rootElementStyle, float effectiveZoom); 60 void setFontSizeValue(CSSValue*, RenderStyle* parentStyle, const RenderStyle * rootElementStyle, float effectiveZoom);
61 61
62 void setWeight(FontWeight); 62 void setWeight(FontWeight);
63 void setWeightBolder(); 63 void setWeightBolder();
64 void setWeightLighter(); 64 void setWeightLighter();
65 void setStretch(FontStretch);
66 65
67 void setFontVariantLigaturesInitial(); 66 void setFontVariantLigaturesInitial();
68 void setFontVariantLigaturesInherit(const FontDescription&); 67 void setFontVariantLigaturesInherit(const FontDescription&);
69 void setFontVariantLigaturesValue(CSSValue*); 68 void setFontVariantLigaturesValue(CSSValue*);
70 69
71 void setFeatureSettingsNormal(); 70 void setFeatureSettingsNormal();
72 void setFeatureSettingsValue(CSSValue*); 71 void setFeatureSettingsValue(CSSValue*);
73 72
74 void setScript(const String& locale); 73 void setScript(const String& locale);
75 void setItalic(FontItalic); 74 void setItalic(FontItalic);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 // object on RenderStyle from various other font-related 123 // object on RenderStyle from various other font-related
125 // properties on RenderStyle. Whenever one of those 124 // properties on RenderStyle. Whenever one of those
126 // is changed, FontBuilder tracks the need to update 125 // is changed, FontBuilder tracks the need to update
127 // style->font() with this bool. 126 // style->font() with this bool.
128 bool m_fontDirty; 127 bool m_fontDirty;
129 }; 128 };
130 129
131 } 130 }
132 131
133 #endif 132 #endif
OLDNEW
« no previous file with comments | « trunk/Source/core/css/resolver/AnimatedStyleBuilder.cpp ('k') | trunk/Source/core/css/resolver/FontBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698