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

Side by Side Diff: trunk/Source/core/rendering/style/RenderStyle.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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 void setClip(LengthBox box) { SET_VAR(visual, clip, box); } 1084 void setClip(LengthBox box) { SET_VAR(visual, clip, box); }
1085 1085
1086 void setUnicodeBidi(EUnicodeBidi b) { noninherited_flags._unicodeBidi = b; } 1086 void setUnicodeBidi(EUnicodeBidi b) { noninherited_flags._unicodeBidi = b; }
1087 1087
1088 void setClear(EClear v) { noninherited_flags._clear = v; } 1088 void setClear(EClear v) { noninherited_flags._clear = v; }
1089 void setTableLayout(ETableLayout v) { noninherited_flags._table_layout = v; } 1089 void setTableLayout(ETableLayout v) { noninherited_flags._table_layout = v; }
1090 1090
1091 bool setFontDescription(const FontDescription&); 1091 bool setFontDescription(const FontDescription&);
1092 // Only used for blending font sizes when animating and for text autosizing. 1092 // Only used for blending font sizes when animating and for text autosizing.
1093 void setFontSize(float); 1093 void setFontSize(float);
1094 void setFontStretch(FontStretch);
1095 void setFontWeight(FontWeight); 1094 void setFontWeight(FontWeight);
1096 1095
1097 void setTextAutosizingMultiplier(float v) 1096 void setTextAutosizingMultiplier(float v)
1098 { 1097 {
1099 SET_VAR(visual, m_textAutosizingMultiplier, v); 1098 SET_VAR(visual, m_textAutosizingMultiplier, v);
1100 setFontSize(fontDescription().specifiedSize()); 1099 setFontSize(fontDescription().specifiedSize());
1101 } 1100 }
1102 1101
1103 void setColor(const Color&); 1102 void setColor(const Color&);
1104 void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); } 1103 void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); }
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
1886 inline bool RenderStyle::hasPseudoElementStyle() const 1885 inline bool RenderStyle::hasPseudoElementStyle() const
1887 { 1886 {
1888 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK; 1887 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK;
1889 } 1888 }
1890 1889
1891 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1890 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1892 1891
1893 } // namespace WebCore 1892 } // namespace WebCore
1894 1893
1895 #endif // RenderStyle_h 1894 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « trunk/Source/core/css/resolver/StyleResolver.cpp ('k') | trunk/Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698