| 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 739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 750 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit
edData->userSelect); } | 750 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit
edData->userSelect); } |
| 751 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon
InheritedData->textOverflow); } | 751 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon
InheritedData->textOverflow); } |
| 752 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol
lapse>(rareNonInheritedData->marginBeforeCollapse); } | 752 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol
lapse>(rareNonInheritedData->marginBeforeCollapse); } |
| 753 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl
apse>(rareNonInheritedData->marginAfterCollapse); } | 753 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl
apse>(rareNonInheritedData->marginAfterCollapse); } |
| 754 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD
ata->wordBreak); } | 754 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD
ata->wordBreak); } |
| 755 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI
nheritedData->overflowWrap); } | 755 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI
nheritedData->overflowWrap); } |
| 756 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat
a->lineBreak); } | 756 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat
a->lineBreak); } |
| 757 const AtomicString& highlight() const { return rareInheritedData->highlight;
} | 757 const AtomicString& highlight() const { return rareInheritedData->highlight;
} |
| 758 const AtomicString& hyphenationString() const { return rareInheritedData->hy
phenationString; } | 758 const AtomicString& hyphenationString() const { return rareInheritedData->hy
phenationString; } |
| 759 const AtomicString& locale() const { return rareInheritedData->locale; } | 759 const AtomicString& locale() const { return rareInheritedData->locale; } |
| 760 EBorderFit borderFit() const { return static_cast<EBorderFit>(rareNonInherit
edData->m_borderFit); } | |
| 761 EResize resize() const { return static_cast<EResize>(rareInheritedData->resi
ze); } | 760 EResize resize() const { return static_cast<EResize>(rareInheritedData->resi
ze); } |
| 762 bool hasInlineTransform() const { return rareNonInheritedData->m_hasInlineTr
ansform; } | 761 bool hasInlineTransform() const { return rareNonInheritedData->m_hasInlineTr
ansform; } |
| 763 const TransformOperations& transform() const { return rareNonInheritedData->
m_transform->m_operations; } | 762 const TransformOperations& transform() const { return rareNonInheritedData->
m_transform->m_operations; } |
| 764 const Length& transformOriginX() const { return rareNonInheritedData->m_tran
sform->m_x; } | 763 const Length& transformOriginX() const { return rareNonInheritedData->m_tran
sform->m_x; } |
| 765 const Length& transformOriginY() const { return rareNonInheritedData->m_tran
sform->m_y; } | 764 const Length& transformOriginY() const { return rareNonInheritedData->m_tran
sform->m_y; } |
| 766 float transformOriginZ() const { return rareNonInheritedData->m_transform->m
_z; } | 765 float transformOriginZ() const { return rareNonInheritedData->m_transform->m
_z; } |
| 767 bool hasTransform() const { return !rareNonInheritedData->m_transform->m_ope
rations.operations().isEmpty(); } | 766 bool hasTransform() const { return !rareNonInheritedData->m_transform->m_ope
rations.operations().isEmpty(); } |
| 768 bool transformDataEquivalent(const RenderStyle& otherStyle) const { return r
areNonInheritedData->m_transform == otherStyle.rareNonInheritedData->m_transform
; } | 767 bool transformDataEquivalent(const RenderStyle& otherStyle) const { return r
areNonInheritedData->m_transform == otherStyle.rareNonInheritedData->m_transform
; } |
| 769 | 768 |
| 770 TextEmphasisFill textEmphasisFill() const { return static_cast<TextEmphasisF
ill>(rareInheritedData->textEmphasisFill); } | 769 TextEmphasisFill textEmphasisFill() const { return static_cast<TextEmphasisF
ill>(rareInheritedData->textEmphasisFill); } |
| (...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1169 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData,
textOverflow, overflow); } | 1168 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData,
textOverflow, overflow); } |
| 1170 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa
ta, marginBeforeCollapse, c); } | 1169 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa
ta, marginBeforeCollapse, c); } |
| 1171 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat
a, marginAfterCollapse, c); } | 1170 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat
a, marginAfterCollapse, c); } |
| 1172 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b);
} | 1171 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b);
} |
| 1173 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW
rap, b); } | 1172 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW
rap, b); } |
| 1174 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); } | 1173 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); } |
| 1175 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli
ght, h); } | 1174 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli
ght, h); } |
| 1176 void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); } | 1175 void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); } |
| 1177 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData
, hyphenationString, h); } | 1176 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData
, hyphenationString, h); } |
| 1178 void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, loca
le, locale); } | 1177 void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, loca
le, locale); } |
| 1179 void setBorderFit(EBorderFit b) { SET_VAR(rareNonInheritedData, m_borderFit,
b); } | |
| 1180 void setResize(EResize r) { SET_VAR(rareInheritedData, resize, r); } | 1178 void setResize(EResize r) { SET_VAR(rareInheritedData, resize, r); } |
| 1181 void setHasInlineTransform(bool b) { SET_VAR(rareNonInheritedData, m_hasInli
neTransform, b); } | 1179 void setHasInlineTransform(bool b) { SET_VAR(rareNonInheritedData, m_hasInli
neTransform, b); } |
| 1182 void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInherited
Data.access()->m_transform, m_operations, ops); } | 1180 void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInherited
Data.access()->m_transform, m_operations, ops); } |
| 1183 void setTransformOriginX(const Length& l) { SET_VAR(rareNonInheritedData.acc
ess()->m_transform, m_x, l); } | 1181 void setTransformOriginX(const Length& l) { SET_VAR(rareNonInheritedData.acc
ess()->m_transform, m_x, l); } |
| 1184 void setTransformOriginY(const Length& l) { SET_VAR(rareNonInheritedData.acc
ess()->m_transform, m_y, l); } | 1182 void setTransformOriginY(const Length& l) { SET_VAR(rareNonInheritedData.acc
ess()->m_transform, m_y, l); } |
| 1185 void setTransformOriginZ(float f) { SET_VAR(rareNonInheritedData.access()->m
_transform, m_z, f); } | 1183 void setTransformOriginZ(float f) { SET_VAR(rareNonInheritedData.access()->m
_transform, m_z, f); } |
| 1186 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); } | 1184 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); } |
| 1187 void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedD
ata, m_textDecorationColor, c); } | 1185 void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedD
ata, m_textDecorationColor, c); } |
| 1188 void setTextEmphasisColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInh
eritedData, textEmphasisColor, setTextEmphasisColor, c); } | 1186 void setTextEmphasisColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInh
eritedData, textEmphasisColor, setTextEmphasisColor, c); } |
| 1189 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData,
textEmphasisFill, fill); } | 1187 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData,
textEmphasisFill, fill); } |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1419 static TextOverflow initialTextOverflow() { return TextOverflowClip; } | 1417 static TextOverflow initialTextOverflow() { return TextOverflowClip; } |
| 1420 static EMarginCollapse initialMarginBeforeCollapse() { return MCOLLAPSE; } | 1418 static EMarginCollapse initialMarginBeforeCollapse() { return MCOLLAPSE; } |
| 1421 static EMarginCollapse initialMarginAfterCollapse() { return MCOLLAPSE; } | 1419 static EMarginCollapse initialMarginAfterCollapse() { return MCOLLAPSE; } |
| 1422 static EWordBreak initialWordBreak() { return NormalWordBreak; } | 1420 static EWordBreak initialWordBreak() { return NormalWordBreak; } |
| 1423 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; } | 1421 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; } |
| 1424 static LineBreak initialLineBreak() { return LineBreakAuto; } | 1422 static LineBreak initialLineBreak() { return LineBreakAuto; } |
| 1425 static const AtomicString& initialHighlight() { return nullAtom; } | 1423 static const AtomicString& initialHighlight() { return nullAtom; } |
| 1426 static ESpeak initialSpeak() { return SpeakNormal; } | 1424 static ESpeak initialSpeak() { return SpeakNormal; } |
| 1427 static const AtomicString& initialHyphenationString() { return nullAtom; } | 1425 static const AtomicString& initialHyphenationString() { return nullAtom; } |
| 1428 static const AtomicString& initialLocale() { return nullAtom; } | 1426 static const AtomicString& initialLocale() { return nullAtom; } |
| 1429 static EBorderFit initialBorderFit() { return BorderFitBorder; } | |
| 1430 static EResize initialResize() { return RESIZE_NONE; } | 1427 static EResize initialResize() { return RESIZE_NONE; } |
| 1431 static bool initialHasAspectRatio() { return false; } | 1428 static bool initialHasAspectRatio() { return false; } |
| 1432 static float initialAspectRatioDenominator() { return 1; } | 1429 static float initialAspectRatioDenominator() { return 1; } |
| 1433 static float initialAspectRatioNumerator() { return 1; } | 1430 static float initialAspectRatioNumerator() { return 1; } |
| 1434 static Order initialRTLOrdering() { return LogicalOrder; } | 1431 static Order initialRTLOrdering() { return LogicalOrder; } |
| 1435 static float initialTextStrokeWidth() { return 0; } | 1432 static float initialTextStrokeWidth() { return 0; } |
| 1436 static unsigned short initialColumnCount() { return 1; } | 1433 static unsigned short initialColumnCount() { return 1; } |
| 1437 static ColumnFill initialColumnFill() { return ColumnFillBalance; } | 1434 static ColumnFill initialColumnFill() { return ColumnFillBalance; } |
| 1438 static const TransformOperations& initialTransform() { DEFINE_STATIC_LOCAL(T
ransformOperations, ops, ()); return ops; } | 1435 static const TransformOperations& initialTransform() { DEFINE_STATIC_LOCAL(T
ransformOperations, ops, ()); return ops; } |
| 1439 static Length initialTransformOriginX() { return Length(50.0, Percent); } | 1436 static Length initialTransformOriginX() { return Length(50.0, Percent); } |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1633 | 1630 |
| 1634 rareInheritedData.access()->m_textOrientation = textOrientation; | 1631 rareInheritedData.access()->m_textOrientation = textOrientation; |
| 1635 return true; | 1632 return true; |
| 1636 } | 1633 } |
| 1637 | 1634 |
| 1638 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect
::Radii&); | 1635 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect
::Radii&); |
| 1639 | 1636 |
| 1640 } // namespace blink | 1637 } // namespace blink |
| 1641 | 1638 |
| 1642 #endif // RenderStyle_h | 1639 #endif // RenderStyle_h |
| OLD | NEW |