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

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

Issue 13723004: Remove the ENABLE_TEXT_AUTOSIZING compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 EClear clear() const { return static_cast<EClear>(noninherited_flags._clear) ; } 552 EClear clear() const { return static_cast<EClear>(noninherited_flags._clear) ; }
553 ETableLayout tableLayout() const { return static_cast<ETableLayout>(noninher ited_flags._table_layout); } 553 ETableLayout tableLayout() const { return static_cast<ETableLayout>(noninher ited_flags._table_layout); }
554 554
555 const Font& font() const; 555 const Font& font() const;
556 const FontMetrics& fontMetrics() const; 556 const FontMetrics& fontMetrics() const;
557 const FontDescription& fontDescription() const; 557 const FontDescription& fontDescription() const;
558 float specifiedFontSize() const; 558 float specifiedFontSize() const;
559 float computedFontSize() const; 559 float computedFontSize() const;
560 int fontSize() const; 560 int fontSize() const;
561 561
562 #if ENABLE(TEXT_AUTOSIZING)
563 float textAutosizingMultiplier() const { return visual->m_textAutosizingMult iplier; } 562 float textAutosizingMultiplier() const { return visual->m_textAutosizingMult iplier; }
564 #endif
565 563
566 Length textIndent() const { return rareInheritedData->indent; } 564 Length textIndent() const { return rareInheritedData->indent; }
567 #if ENABLE(CSS3_TEXT) 565 #if ENABLE(CSS3_TEXT)
568 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); } 566 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); }
569 #endif 567 #endif
570 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); } 568 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); }
571 ETextTransform textTransform() const { return static_cast<ETextTransform>(in herited_flags._text_transform); } 569 ETextTransform textTransform() const { return static_cast<ETextTransform>(in herited_flags._text_transform); }
572 ETextDecoration textDecorationsInEffect() const { return static_cast<ETextDe coration>(inherited_flags._text_decorations); } 570 ETextDecoration textDecorationsInEffect() const { return static_cast<ETextDe coration>(inherited_flags._text_decorations); }
573 ETextDecoration textDecoration() const { return static_cast<ETextDecoration> (visual->textDecoration); } 571 ETextDecoration textDecoration() const { return static_cast<ETextDecoration> (visual->textDecoration); }
574 #if ENABLE(CSS3_TEXT) 572 #if ENABLE(CSS3_TEXT)
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
1095 1093
1096 void setUnicodeBidi(EUnicodeBidi b) { noninherited_flags._unicodeBidi = b; } 1094 void setUnicodeBidi(EUnicodeBidi b) { noninherited_flags._unicodeBidi = b; }
1097 1095
1098 void setClear(EClear v) { noninherited_flags._clear = v; } 1096 void setClear(EClear v) { noninherited_flags._clear = v; }
1099 void setTableLayout(ETableLayout v) { noninherited_flags._table_layout = v; } 1097 void setTableLayout(ETableLayout v) { noninherited_flags._table_layout = v; }
1100 1098
1101 bool setFontDescription(const FontDescription&); 1099 bool setFontDescription(const FontDescription&);
1102 // Only used for blending font sizes when animating, for MathML anonymous bl ocks, and for text autosizing. 1100 // Only used for blending font sizes when animating, for MathML anonymous bl ocks, and for text autosizing.
1103 void setFontSize(float); 1101 void setFontSize(float);
1104 1102
1105 #if ENABLE(TEXT_AUTOSIZING)
1106 void setTextAutosizingMultiplier(float v) 1103 void setTextAutosizingMultiplier(float v)
1107 { 1104 {
1108 SET_VAR(visual, m_textAutosizingMultiplier, v); 1105 SET_VAR(visual, m_textAutosizingMultiplier, v);
1109 setFontSize(fontDescription().specifiedSize()); 1106 setFontSize(fontDescription().specifiedSize());
1110 } 1107 }
1111 #endif
1112 1108
1113 void setColor(const Color&); 1109 void setColor(const Color&);
1114 void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); } 1110 void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); }
1115 #if ENABLE(CSS3_TEXT) 1111 #if ENABLE(CSS3_TEXT)
1116 void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_text IndentLine, v); } 1112 void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_text IndentLine, v); }
1117 #endif 1113 #endif
1118 void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; } 1114 void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; }
1119 void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; } 1115 void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; }
1120 void addToTextDecorationsInEffect(ETextDecoration v) { inherited_flags._text _decorations |= v; } 1116 void addToTextDecorationsInEffect(ETextDecoration v) { inherited_flags._text _decorations |= v; }
1121 void setTextDecorationsInEffect(ETextDecoration v) { inherited_flags._text_d ecorations = v; } 1117 void setTextDecorationsInEffect(ETextDecoration v) { inherited_flags._text_d ecorations = v; }
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
1861 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1857 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1862 return false; 1858 return false;
1863 1859
1864 rareInheritedData.access()->m_textOrientation = textOrientation; 1860 rareInheritedData.access()->m_textOrientation = textOrientation;
1865 return true; 1861 return true;
1866 } 1862 }
1867 1863
1868 } // namespace WebCore 1864 } // namespace WebCore
1869 1865
1870 #endif // RenderStyle_h 1866 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698