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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2100013002: Implement the new text-size-adjust CSS property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update virtual expectation, minor cleanup. Created 4 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
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 745 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 756
757 EInsideLink insideLink() const { return static_cast<EInsideLink>(inherited_f lags._insideLink); } 757 EInsideLink insideLink() const { return static_cast<EInsideLink>(inherited_f lags._insideLink); }
758 bool isLink() const { return noninherited_flags.isLink; } 758 bool isLink() const { return noninherited_flags.isLink; }
759 759
760 short widows() const { return rareInheritedData->widows; } 760 short widows() const { return rareInheritedData->widows; }
761 short orphans() const { return rareInheritedData->orphans; } 761 short orphans() const { return rareInheritedData->orphans; }
762 EBreak breakAfter() const { return static_cast<EBreak>(noninherited_flags.br eakAfter); } 762 EBreak breakAfter() const { return static_cast<EBreak>(noninherited_flags.br eakAfter); }
763 EBreak breakBefore() const { return static_cast<EBreak>(noninherited_flags.b reakBefore); } 763 EBreak breakBefore() const { return static_cast<EBreak>(noninherited_flags.b reakBefore); }
764 EBreak breakInside() const { return static_cast<EBreak>(noninherited_flags.b reakInside); } 764 EBreak breakInside() const { return static_cast<EBreak>(noninherited_flags.b reakInside); }
765 765
766 TextSizeAdjust getTextSizeAdjust() const { return rareInheritedData->m_textS izeAdjust; }
767
766 // CSS3 Getter Methods 768 // CSS3 Getter Methods
767 769
768 int outlineOffset() const 770 int outlineOffset() const
769 { 771 {
770 if (m_background->outline().style() == BorderStyleNone) 772 if (m_background->outline().style() == BorderStyleNone)
771 return 0; 773 return 0;
772 return m_background->outline().offset(); 774 return m_background->outline().offset();
773 } 775 }
774 776
775 ShadowList* textShadow() const { return rareInheritedData->textShadow.get(); } 777 ShadowList* textShadow() const { return rareInheritedData->textShadow.get(); }
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
1311 bool hasAutoZIndex() const { return m_box->hasAutoZIndex(); } 1313 bool hasAutoZIndex() const { return m_box->hasAutoZIndex(); }
1312 void setHasAutoZIndex() { SET_VAR(m_box, m_hasAutoZIndex, true); SET_VAR(m_b ox, m_zIndex, 0); } 1314 void setHasAutoZIndex() { SET_VAR(m_box, m_hasAutoZIndex, true); SET_VAR(m_b ox, m_zIndex, 0); }
1313 int zIndex() const { return m_box->zIndex(); } 1315 int zIndex() const { return m_box->zIndex(); }
1314 void setZIndex(int v) { SET_VAR(m_box, m_hasAutoZIndex, false); SET_VAR(m_bo x, m_zIndex, v); } 1316 void setZIndex(int v) { SET_VAR(m_box, m_hasAutoZIndex, false); SET_VAR(m_bo x, m_zIndex, v); }
1315 void setWidows(short w) { SET_VAR(rareInheritedData, widows, w); } 1317 void setWidows(short w) { SET_VAR(rareInheritedData, widows, w); }
1316 void setOrphans(short o) { SET_VAR(rareInheritedData, orphans, o); } 1318 void setOrphans(short o) { SET_VAR(rareInheritedData, orphans, o); }
1317 void setBreakAfter(EBreak b) { ASSERT(b <= BreakValueLastAllowedForBreakAfte rAndBefore); noninherited_flags.breakAfter = b; } 1319 void setBreakAfter(EBreak b) { ASSERT(b <= BreakValueLastAllowedForBreakAfte rAndBefore); noninherited_flags.breakAfter = b; }
1318 void setBreakBefore(EBreak b) { ASSERT(b <= BreakValueLastAllowedForBreakAft erAndBefore); noninherited_flags.breakBefore = b; } 1320 void setBreakBefore(EBreak b) { ASSERT(b <= BreakValueLastAllowedForBreakAft erAndBefore); noninherited_flags.breakBefore = b; }
1319 void setBreakInside(EBreak b) { ASSERT(b <= BreakValueLastAllowedForBreakIns ide); noninherited_flags.breakInside = b; } 1321 void setBreakInside(EBreak b) { ASSERT(b <= BreakValueLastAllowedForBreakIns ide); noninherited_flags.breakInside = b; }
1320 1322
1323 void setTextSizeAdjust(TextSizeAdjust sizeAdjust) { SET_VAR(rareInheritedDat a, m_textSizeAdjust, sizeAdjust); }
1324
1321 // CSS3 Setters 1325 // CSS3 Setters
1322 void setOutlineOffset(int v) { SET_VAR(m_background, m_outline.m_offset, v); } 1326 void setOutlineOffset(int v) { SET_VAR(m_background, m_outline.m_offset, v); }
1323 void setTextShadow(PassRefPtr<ShadowList>); 1327 void setTextShadow(PassRefPtr<ShadowList>);
1324 void setTextStrokeColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInher itedData, textStrokeColor, setTextStrokeColor, c); } 1328 void setTextStrokeColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInher itedData, textStrokeColor, setTextStrokeColor, c); }
1325 void setTextStrokeWidth(float w) { SET_VAR(rareInheritedData, textStrokeWidt h, w); } 1329 void setTextStrokeWidth(float w) { SET_VAR(rareInheritedData, textStrokeWidt h, w); }
1326 void setTextFillColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInherit edData, textFillColor, setTextFillColor, c); } 1330 void setTextFillColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInherit edData, textFillColor, setTextFillColor, c); }
1327 void setOpacity(float f) { float v = clampTo<float>(f, 0, 1); SET_VAR(rareNo nInheritedData, opacity, v); } 1331 void setOpacity(float f) { float v = clampTo<float>(f, 0, 1); SET_VAR(rareNo nInheritedData, opacity, v); }
1328 void setAppearance(ControlPart a) { SET_VAR(rareNonInheritedData, m_appearan ce, a); } 1332 void setAppearance(ControlPart a) { SET_VAR(rareNonInheritedData, m_appearan ce, a); }
1329 // For valid values of box-align see http://www.w3.org/TR/2009/WD-css3-flexb ox-20090723/#alignment 1333 // For valid values of box-align see http://www.w3.org/TR/2009/WD-css3-flexb ox-20090723/#alignment
1330 void setBoxAlign(EBoxAlignment a) { SET_NESTED_VAR(rareNonInheritedData, m_d eprecatedFlexibleBox, align, a); } 1334 void setBoxAlign(EBoxAlignment a) { SET_NESTED_VAR(rareNonInheritedData, m_d eprecatedFlexibleBox, align, a); }
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
1841 static Length initialGridRowGap() { return Length(Fixed); } 1845 static Length initialGridRowGap() { return Length(Fixed); }
1842 1846
1843 // 'auto' is the default. 1847 // 'auto' is the default.
1844 static GridPosition initialGridColumnStart() { return GridPosition(); } 1848 static GridPosition initialGridColumnStart() { return GridPosition(); }
1845 static GridPosition initialGridColumnEnd() { return GridPosition(); } 1849 static GridPosition initialGridColumnEnd() { return GridPosition(); }
1846 static GridPosition initialGridRowStart() { return GridPosition(); } 1850 static GridPosition initialGridRowStart() { return GridPosition(); }
1847 static GridPosition initialGridRowEnd() { return GridPosition(); } 1851 static GridPosition initialGridRowEnd() { return GridPosition(); }
1848 1852
1849 static TabSize initialTabSize() { return TabSize(8); } 1853 static TabSize initialTabSize() { return TabSize(8); }
1850 1854
1855 static TextSizeAdjust initialTextSizeAdjust() { return TextSizeAdjust::adjus tAuto(); }
1856
1851 static WrapFlow initialWrapFlow() { return WrapFlowAuto; } 1857 static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
1852 static WrapThrough initialWrapThrough() { return WrapThroughWrap; } 1858 static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
1853 1859
1854 static QuotesData* initialQuotes() { return 0; } 1860 static QuotesData* initialQuotes() { return 0; }
1855 1861
1856 // Keep these at the end. 1862 // Keep these at the end.
1857 // FIXME: Why? Seems these should all be one big sorted list. 1863 // FIXME: Why? Seems these should all be one big sorted list.
1858 static LineClampValue initialLineClamp() { return LineClampValue(); } 1864 static LineClampValue initialLineClamp() { return LineClampValue(); }
1859 static ETextSecurity initialTextSecurity() { return TSNONE; } 1865 static ETextSecurity initialTextSecurity() { return TSNONE; }
1860 static Color initialTapHighlightColor(); 1866 static Color initialTapHighlightColor();
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
2041 } 2047 }
2042 2048
2043 inline bool ComputedStyle::hasPseudoElementStyle() const 2049 inline bool ComputedStyle::hasPseudoElementStyle() const
2044 { 2050 {
2045 return noninherited_flags.pseudoBits & ElementPseudoIdMask; 2051 return noninherited_flags.pseudoBits & ElementPseudoIdMask;
2046 } 2052 }
2047 2053
2048 } // namespace blink 2054 } // namespace blink
2049 2055
2050 #endif // ComputedStyle_h 2056 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698