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

Side by Side Diff: Source/core/rendering/style/RenderStyle.h

Issue 173953002: Make font-weight animatable. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Use clampTo<int>. Created 6 years, 10 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
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 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 553
554 EClear clear() const { return static_cast<EClear>(noninherited_flags._clear) ; } 554 EClear clear() const { return static_cast<EClear>(noninherited_flags._clear) ; }
555 ETableLayout tableLayout() const { return static_cast<ETableLayout>(noninher ited_flags._table_layout); } 555 ETableLayout tableLayout() const { return static_cast<ETableLayout>(noninher ited_flags._table_layout); }
556 556
557 const Font& font() const; 557 const Font& font() const;
558 const FontMetrics& fontMetrics() const; 558 const FontMetrics& fontMetrics() const;
559 const FontDescription& fontDescription() const; 559 const FontDescription& fontDescription() const;
560 float specifiedFontSize() const; 560 float specifiedFontSize() const;
561 float computedFontSize() const; 561 float computedFontSize() const;
562 int fontSize() const; 562 int fontSize() const;
563 FontWeight fontWeight() const;
563 564
564 float textAutosizingMultiplier() const { return visual->m_textAutosizingMult iplier; } 565 float textAutosizingMultiplier() const { return visual->m_textAutosizingMult iplier; }
565 566
566 Length textIndent() const { return rareInheritedData->indent; } 567 Length textIndent() const { return rareInheritedData->indent; }
567 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); } 568 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); }
568 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); } 569 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); }
569 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); } 570 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); }
570 TextJustify textJustify() const { return static_cast<TextJustify>(rareInheri tedData->m_textJustify); } 571 TextJustify textJustify() const { return static_cast<TextJustify>(rareInheri tedData->m_textJustify); }
571 ETextTransform textTransform() const { return static_cast<ETextTransform>(in herited_flags._text_transform); } 572 ETextTransform textTransform() const { return static_cast<ETextTransform>(in herited_flags._text_transform); }
572 TextDecoration textDecorationsInEffect() const { return static_cast<TextDeco ration>(inherited_flags._text_decorations); } 573 TextDecoration textDecorationsInEffect() const { return static_cast<TextDeco ration>(inherited_flags._text_decorations); }
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 void setClip(LengthBox box) { SET_VAR(visual, clip, box); } 1081 void setClip(LengthBox box) { SET_VAR(visual, clip, box); }
1081 1082
1082 void setUnicodeBidi(EUnicodeBidi b) { noninherited_flags._unicodeBidi = b; } 1083 void setUnicodeBidi(EUnicodeBidi b) { noninherited_flags._unicodeBidi = b; }
1083 1084
1084 void setClear(EClear v) { noninherited_flags._clear = v; } 1085 void setClear(EClear v) { noninherited_flags._clear = v; }
1085 void setTableLayout(ETableLayout v) { noninherited_flags._table_layout = v; } 1086 void setTableLayout(ETableLayout v) { noninherited_flags._table_layout = v; }
1086 1087
1087 bool setFontDescription(const FontDescription&); 1088 bool setFontDescription(const FontDescription&);
1088 // Only used for blending font sizes when animating and for text autosizing. 1089 // Only used for blending font sizes when animating and for text autosizing.
1089 void setFontSize(float); 1090 void setFontSize(float);
1091 void setFontWeight(FontWeight);
1090 1092
1091 void setTextAutosizingMultiplier(float v) 1093 void setTextAutosizingMultiplier(float v)
1092 { 1094 {
1093 SET_VAR(visual, m_textAutosizingMultiplier, v); 1095 SET_VAR(visual, m_textAutosizingMultiplier, v);
1094 setFontSize(fontDescription().specifiedSize()); 1096 setFontSize(fontDescription().specifiedSize());
1095 } 1097 }
1096 1098
1097 void setColor(const Color&); 1099 void setColor(const Color&);
1098 void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); } 1100 void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); }
1099 void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_text IndentLine, v); } 1101 void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_text IndentLine, v); }
(...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after
1878 } 1880 }
1879 1881
1880 inline bool RenderStyle::hasPseudoElementStyle() const 1882 inline bool RenderStyle::hasPseudoElementStyle() const
1881 { 1883 {
1882 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK; 1884 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK;
1883 } 1885 }
1884 1886
1885 } // namespace WebCore 1887 } // namespace WebCore
1886 1888
1887 #endif // RenderStyle_h 1889 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/css/resolver/AnimatedStyleBuilder.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698