| OLD | NEW |
| 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 814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 825 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit
edData->userSelect); } | 825 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit
edData->userSelect); } |
| 826 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon
InheritedData->textOverflow); } | 826 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon
InheritedData->textOverflow); } |
| 827 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol
lapse>(rareNonInheritedData->marginBeforeCollapse); } | 827 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol
lapse>(rareNonInheritedData->marginBeforeCollapse); } |
| 828 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl
apse>(rareNonInheritedData->marginAfterCollapse); } | 828 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl
apse>(rareNonInheritedData->marginAfterCollapse); } |
| 829 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD
ata->wordBreak); } | 829 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD
ata->wordBreak); } |
| 830 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI
nheritedData->overflowWrap); } | 830 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI
nheritedData->overflowWrap); } |
| 831 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat
a->lineBreak); } | 831 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat
a->lineBreak); } |
| 832 const AtomicString& highlight() const { return rareInheritedData->highlight;
} | 832 const AtomicString& highlight() const { return rareInheritedData->highlight;
} |
| 833 const AtomicString& hyphenationString() const { return rareInheritedData->hy
phenationString; } | 833 const AtomicString& hyphenationString() const { return rareInheritedData->hy
phenationString; } |
| 834 const AtomicString& locale() const { return rareInheritedData->locale; } | 834 const AtomicString& locale() const { return rareInheritedData->locale; } |
| 835 EBorderFit borderFit() const { return static_cast<EBorderFit>(rareNonInherit
edData->m_borderFit); } | |
| 836 EResize resize() const { return static_cast<EResize>(rareInheritedData->resi
ze); } | 835 EResize resize() const { return static_cast<EResize>(rareInheritedData->resi
ze); } |
| 837 bool hasInlinePaginationAxis() const | 836 bool hasInlinePaginationAxis() const |
| 838 { | 837 { |
| 839 // If the pagination axis is parallel with the writing mode inline axis,
columns may be laid | 838 // If the pagination axis is parallel with the writing mode inline axis,
columns may be laid |
| 840 // out along the inline axis, just like for regular multicol. Otherwise,
we need to lay out | 839 // out along the inline axis, just like for regular multicol. Otherwise,
we need to lay out |
| 841 // along the block axis. | 840 // along the block axis. |
| 842 if (isOverflowPaged()) | 841 if (isOverflowPaged()) |
| 843 return (overflowY() == OPAGEDX) == isHorizontalWritingMode(); | 842 return (overflowY() == OPAGEDX) == isHorizontalWritingMode(); |
| 844 return false; | 843 return false; |
| 845 } | 844 } |
| (...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1312 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData,
textOverflow, overflow); } | 1311 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData,
textOverflow, overflow); } |
| 1313 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa
ta, marginBeforeCollapse, c); } | 1312 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa
ta, marginBeforeCollapse, c); } |
| 1314 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat
a, marginAfterCollapse, c); } | 1313 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat
a, marginAfterCollapse, c); } |
| 1315 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b);
} | 1314 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b);
} |
| 1316 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW
rap, b); } | 1315 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW
rap, b); } |
| 1317 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); } | 1316 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); } |
| 1318 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli
ght, h); } | 1317 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli
ght, h); } |
| 1319 void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); } | 1318 void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); } |
| 1320 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData
, hyphenationString, h); } | 1319 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData
, hyphenationString, h); } |
| 1321 void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, loca
le, locale); } | 1320 void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, loca
le, locale); } |
| 1322 void setBorderFit(EBorderFit b) { SET_VAR(rareNonInheritedData, m_borderFit,
b); } | |
| 1323 void setResize(EResize r) { SET_VAR(rareInheritedData, resize, r); } | 1321 void setResize(EResize r) { SET_VAR(rareInheritedData, resize, r); } |
| 1324 void setColumnWidth(float f) { SET_VAR(rareNonInheritedData.access()->m_mult
iCol, m_autoWidth, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_
width, f); } | 1322 void setColumnWidth(float f) { SET_VAR(rareNonInheritedData.access()->m_mult
iCol, m_autoWidth, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_
width, f); } |
| 1325 void setHasAutoColumnWidth() { SET_VAR(rareNonInheritedData.access()->m_mult
iCol, m_autoWidth, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_w
idth, 0); } | 1323 void setHasAutoColumnWidth() { SET_VAR(rareNonInheritedData.access()->m_mult
iCol, m_autoWidth, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_w
idth, 0); } |
| 1326 void setColumnCount(unsigned short c) { SET_VAR(rareNonInheritedData.access(
)->m_multiCol, m_autoCount, false); SET_VAR(rareNonInheritedData.access()->m_mul
tiCol, m_count, c); } | 1324 void setColumnCount(unsigned short c) { SET_VAR(rareNonInheritedData.access(
)->m_multiCol, m_autoCount, false); SET_VAR(rareNonInheritedData.access()->m_mul
tiCol, m_count, c); } |
| 1327 void setHasAutoColumnCount() { SET_VAR(rareNonInheritedData.access()->m_mult
iCol, m_autoCount, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_c
ount, 0); } | 1325 void setHasAutoColumnCount() { SET_VAR(rareNonInheritedData.access()->m_mult
iCol, m_autoCount, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_c
ount, 0); } |
| 1328 void setColumnFill(ColumnFill columnFill) { SET_VAR(rareNonInheritedData.acc
ess()->m_multiCol, m_fill, columnFill); } | 1326 void setColumnFill(ColumnFill columnFill) { SET_VAR(rareNonInheritedData.acc
ess()->m_multiCol, m_fill, columnFill); } |
| 1329 void setColumnGap(float f) { SET_VAR(rareNonInheritedData.access()->m_multiC
ol, m_normalGap, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_ga
p, f); } | 1327 void setColumnGap(float f) { SET_VAR(rareNonInheritedData.access()->m_multiC
ol, m_normalGap, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_ga
p, f); } |
| 1330 void setHasNormalColumnGap() { SET_VAR(rareNonInheritedData.access()->m_mult
iCol, m_normalGap, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_g
ap, 0); } | 1328 void setHasNormalColumnGap() { SET_VAR(rareNonInheritedData.access()->m_mult
iCol, m_normalGap, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_g
ap, 0); } |
| 1331 void setColumnRuleColor(const StyleColor& c) { SET_BORDERVALUE_COLOR(rareNon
InheritedData.access()->m_multiCol, m_rule, c); } | 1329 void setColumnRuleColor(const StyleColor& c) { SET_BORDERVALUE_COLOR(rareNon
InheritedData.access()->m_multiCol, m_rule, c); } |
| 1332 void setColumnRuleStyle(EBorderStyle b) { SET_VAR(rareNonInheritedData.acces
s()->m_multiCol, m_rule.m_style, b); } | 1330 void setColumnRuleStyle(EBorderStyle b) { SET_VAR(rareNonInheritedData.acces
s()->m_multiCol, m_rule.m_style, b); } |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1639 static TextOverflow initialTextOverflow() { return TextOverflowClip; } | 1637 static TextOverflow initialTextOverflow() { return TextOverflowClip; } |
| 1640 static EMarginCollapse initialMarginBeforeCollapse() { return MCOLLAPSE; } | 1638 static EMarginCollapse initialMarginBeforeCollapse() { return MCOLLAPSE; } |
| 1641 static EMarginCollapse initialMarginAfterCollapse() { return MCOLLAPSE; } | 1639 static EMarginCollapse initialMarginAfterCollapse() { return MCOLLAPSE; } |
| 1642 static EWordBreak initialWordBreak() { return NormalWordBreak; } | 1640 static EWordBreak initialWordBreak() { return NormalWordBreak; } |
| 1643 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; } | 1641 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; } |
| 1644 static LineBreak initialLineBreak() { return LineBreakAuto; } | 1642 static LineBreak initialLineBreak() { return LineBreakAuto; } |
| 1645 static const AtomicString& initialHighlight() { return nullAtom; } | 1643 static const AtomicString& initialHighlight() { return nullAtom; } |
| 1646 static ESpeak initialSpeak() { return SpeakNormal; } | 1644 static ESpeak initialSpeak() { return SpeakNormal; } |
| 1647 static const AtomicString& initialHyphenationString() { return nullAtom; } | 1645 static const AtomicString& initialHyphenationString() { return nullAtom; } |
| 1648 static const AtomicString& initialLocale() { return nullAtom; } | 1646 static const AtomicString& initialLocale() { return nullAtom; } |
| 1649 static EBorderFit initialBorderFit() { return BorderFitBorder; } | |
| 1650 static EResize initialResize() { return RESIZE_NONE; } | 1647 static EResize initialResize() { return RESIZE_NONE; } |
| 1651 static ControlPart initialAppearance() { return NoControlPart; } | 1648 static ControlPart initialAppearance() { return NoControlPart; } |
| 1652 static bool initialHasAspectRatio() { return false; } | 1649 static bool initialHasAspectRatio() { return false; } |
| 1653 static float initialAspectRatioDenominator() { return 1; } | 1650 static float initialAspectRatioDenominator() { return 1; } |
| 1654 static float initialAspectRatioNumerator() { return 1; } | 1651 static float initialAspectRatioNumerator() { return 1; } |
| 1655 static Order initialRTLOrdering() { return LogicalOrder; } | 1652 static Order initialRTLOrdering() { return LogicalOrder; } |
| 1656 static float initialTextStrokeWidth() { return 0; } | 1653 static float initialTextStrokeWidth() { return 0; } |
| 1657 static unsigned short initialColumnCount() { return 1; } | 1654 static unsigned short initialColumnCount() { return 1; } |
| 1658 static ColumnFill initialColumnFill() { return ColumnFillBalance; } | 1655 static ColumnFill initialColumnFill() { return ColumnFillBalance; } |
| 1659 static ColumnSpan initialColumnSpan() { return ColumnSpanNone; } | 1656 static ColumnSpan initialColumnSpan() { return ColumnSpanNone; } |
| (...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1929 inline bool RenderStyle::hasPseudoElementStyle() const | 1926 inline bool RenderStyle::hasPseudoElementStyle() const |
| 1930 { | 1927 { |
| 1931 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; | 1928 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; |
| 1932 } | 1929 } |
| 1933 | 1930 |
| 1934 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect
::Radii&); | 1931 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect
::Radii&); |
| 1935 | 1932 |
| 1936 } // namespace blink | 1933 } // namespace blink |
| 1937 | 1934 |
| 1938 #endif // RenderStyle_h | 1935 #endif // RenderStyle_h |
| OLD | NEW |