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

Side by Side Diff: Source/core/rendering/style/RenderStyle.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
« no previous file with comments | « Source/core/css/resolver/StyleResolver.cpp ('k') | Source/core/rendering/style/RenderStyle.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) 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 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 ETableLayout tableLayout() const { return static_cast<ETableLayout>(noninher ited_flags.tableLayout); } 550 ETableLayout tableLayout() const { return static_cast<ETableLayout>(noninher ited_flags.tableLayout); }
551 bool isFixedTableLayout() const { return tableLayout() == TFIXED && !logical Width().isAuto(); } 551 bool isFixedTableLayout() const { return tableLayout() == TFIXED && !logical Width().isAuto(); }
552 552
553 const Font& font() const; 553 const Font& font() const;
554 const FontMetrics& fontMetrics() const; 554 const FontMetrics& fontMetrics() const;
555 const FontDescription& fontDescription() const; 555 const FontDescription& fontDescription() const;
556 float specifiedFontSize() const; 556 float specifiedFontSize() const;
557 float computedFontSize() const; 557 float computedFontSize() const;
558 int fontSize() const; 558 int fontSize() const;
559 FontWeight fontWeight() const; 559 FontWeight fontWeight() const;
560 FontStretch fontStretch() const;
560 561
561 float textAutosizingMultiplier() const { return inherited->textAutosizingMul tiplier; } 562 float textAutosizingMultiplier() const { return inherited->textAutosizingMul tiplier; }
562 563
563 const Length& textIndent() const { return rareInheritedData->indent; } 564 const Length& textIndent() const { return rareInheritedData->indent; }
564 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); } 565 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); }
565 TextIndentType textIndentType() const { return static_cast<TextIndentType>(r areInheritedData->m_textIndentType); } 566 TextIndentType textIndentType() const { return static_cast<TextIndentType>(r areInheritedData->m_textIndentType); }
566 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); } 567 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); }
567 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); } 568 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); }
568 TextJustify textJustify() const { return static_cast<TextJustify>(rareInheri tedData->m_textJustify); } 569 TextJustify textJustify() const { return static_cast<TextJustify>(rareInheri tedData->m_textJustify); }
569 ETextTransform textTransform() const { return static_cast<ETextTransform>(in herited_flags._text_transform); } 570 ETextTransform textTransform() const { return static_cast<ETextTransform>(in herited_flags._text_transform); }
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
1100 void setClip(const LengthBox& box) { SET_VAR(visual, clip, box); } 1101 void setClip(const LengthBox& box) { SET_VAR(visual, clip, box); }
1101 1102
1102 void setUnicodeBidi(EUnicodeBidi b) { noninherited_flags.unicodeBidi = b; } 1103 void setUnicodeBidi(EUnicodeBidi b) { noninherited_flags.unicodeBidi = b; }
1103 1104
1104 void setClear(EClear v) { noninherited_flags.clear = v; } 1105 void setClear(EClear v) { noninherited_flags.clear = v; }
1105 void setTableLayout(ETableLayout v) { noninherited_flags.tableLayout = v; } 1106 void setTableLayout(ETableLayout v) { noninherited_flags.tableLayout = v; }
1106 1107
1107 bool setFontDescription(const FontDescription&); 1108 bool setFontDescription(const FontDescription&);
1108 // Only used for blending font sizes when animating and for text autosizing. 1109 // Only used for blending font sizes when animating and for text autosizing.
1109 void setFontSize(float); 1110 void setFontSize(float);
1111 void setFontStretch(FontStretch);
1110 void setFontWeight(FontWeight); 1112 void setFontWeight(FontWeight);
1111 1113
1112 void setTextAutosizingMultiplier(float v) 1114 void setTextAutosizingMultiplier(float v)
1113 { 1115 {
1114 SET_VAR(inherited, textAutosizingMultiplier, v); 1116 SET_VAR(inherited, textAutosizingMultiplier, v);
1115 setFontSize(fontDescription().specifiedSize()); 1117 setFontSize(fontDescription().specifiedSize());
1116 } 1118 }
1117 1119
1118 void setColor(const Color&); 1120 void setColor(const Color&);
1119 void setTextIndent(const Length& v) { SET_VAR(rareInheritedData, indent, v); } 1121 void setTextIndent(const Length& v) { SET_VAR(rareInheritedData, indent, v); }
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
1907 inline bool RenderStyle::hasPseudoElementStyle() const 1909 inline bool RenderStyle::hasPseudoElementStyle() const
1908 { 1910 {
1909 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1911 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1910 } 1912 }
1911 1913
1912 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1914 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1913 1915
1914 } // namespace blink 1916 } // namespace blink
1915 1917
1916 #endif // RenderStyle_h 1918 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolver.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698