| 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 705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 716 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit
edData->userSelect); } | 716 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit
edData->userSelect); } |
| 717 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon
InheritedData->textOverflow); } | 717 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon
InheritedData->textOverflow); } |
| 718 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol
lapse>(rareNonInheritedData->marginBeforeCollapse); } | 718 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol
lapse>(rareNonInheritedData->marginBeforeCollapse); } |
| 719 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl
apse>(rareNonInheritedData->marginAfterCollapse); } | 719 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl
apse>(rareNonInheritedData->marginAfterCollapse); } |
| 720 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD
ata->wordBreak); } | 720 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD
ata->wordBreak); } |
| 721 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI
nheritedData->overflowWrap); } | 721 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI
nheritedData->overflowWrap); } |
| 722 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat
a->lineBreak); } | 722 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat
a->lineBreak); } |
| 723 const AtomicString& highlight() const { return rareInheritedData->highlight;
} | 723 const AtomicString& highlight() const { return rareInheritedData->highlight;
} |
| 724 const AtomicString& hyphenationString() const { return rareInheritedData->hy
phenationString; } | 724 const AtomicString& hyphenationString() const { return rareInheritedData->hy
phenationString; } |
| 725 const AtomicString& locale() const { return rareInheritedData->locale; } | 725 const AtomicString& locale() const { return rareInheritedData->locale; } |
| 726 EResize resize() const { return static_cast<EResize>(rareInheritedData->resi
ze); } | |
| 727 bool hasInlineTransform() const { return rareNonInheritedData->m_hasInlineTr
ansform; } | 726 bool hasInlineTransform() const { return rareNonInheritedData->m_hasInlineTr
ansform; } |
| 728 const TransformOperations& transform() const { return rareNonInheritedData->
m_transform->m_operations; } | 727 const TransformOperations& transform() const { return rareNonInheritedData->
m_transform->m_operations; } |
| 729 const Length& transformOriginX() const { return rareNonInheritedData->m_tran
sform->m_x; } | 728 const Length& transformOriginX() const { return rareNonInheritedData->m_tran
sform->m_x; } |
| 730 const Length& transformOriginY() const { return rareNonInheritedData->m_tran
sform->m_y; } | 729 const Length& transformOriginY() const { return rareNonInheritedData->m_tran
sform->m_y; } |
| 731 float transformOriginZ() const { return rareNonInheritedData->m_transform->m
_z; } | 730 float transformOriginZ() const { return rareNonInheritedData->m_transform->m
_z; } |
| 732 bool hasTransform() const { return !rareNonInheritedData->m_transform->m_ope
rations.operations().isEmpty(); } | 731 bool hasTransform() const { return !rareNonInheritedData->m_transform->m_ope
rations.operations().isEmpty(); } |
| 733 bool transformDataEquivalent(const RenderStyle& otherStyle) const { return r
areNonInheritedData->m_transform == otherStyle.rareNonInheritedData->m_transform
; } | 732 bool transformDataEquivalent(const RenderStyle& otherStyle) const { return r
areNonInheritedData->m_transform == otherStyle.rareNonInheritedData->m_transform
; } |
| 734 | 733 |
| 735 TextEmphasisFill textEmphasisFill() const { return static_cast<TextEmphasisF
ill>(rareInheritedData->textEmphasisFill); } | 734 TextEmphasisFill textEmphasisFill() const { return static_cast<TextEmphasisF
ill>(rareInheritedData->textEmphasisFill); } |
| 736 TextEmphasisMark textEmphasisMark() const; | 735 TextEmphasisMark textEmphasisMark() const; |
| (...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1115 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData,
textOverflow, overflow); } | 1114 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData,
textOverflow, overflow); } |
| 1116 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa
ta, marginBeforeCollapse, c); } | 1115 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa
ta, marginBeforeCollapse, c); } |
| 1117 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat
a, marginAfterCollapse, c); } | 1116 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat
a, marginAfterCollapse, c); } |
| 1118 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b);
} | 1117 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b);
} |
| 1119 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW
rap, b); } | 1118 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW
rap, b); } |
| 1120 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); } | 1119 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); } |
| 1121 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli
ght, h); } | 1120 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli
ght, h); } |
| 1122 void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); } | 1121 void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); } |
| 1123 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData
, hyphenationString, h); } | 1122 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData
, hyphenationString, h); } |
| 1124 void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, loca
le, locale); } | 1123 void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, loca
le, locale); } |
| 1125 void setResize(EResize r) { SET_VAR(rareInheritedData, resize, r); } | |
| 1126 void setHasInlineTransform(bool b) { SET_VAR(rareNonInheritedData, m_hasInli
neTransform, b); } | 1124 void setHasInlineTransform(bool b) { SET_VAR(rareNonInheritedData, m_hasInli
neTransform, b); } |
| 1127 void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInherited
Data.access()->m_transform, m_operations, ops); } | 1125 void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInherited
Data.access()->m_transform, m_operations, ops); } |
| 1128 void setTransformOriginX(const Length& l) { SET_VAR(rareNonInheritedData.acc
ess()->m_transform, m_x, l); } | 1126 void setTransformOriginX(const Length& l) { SET_VAR(rareNonInheritedData.acc
ess()->m_transform, m_x, l); } |
| 1129 void setTransformOriginY(const Length& l) { SET_VAR(rareNonInheritedData.acc
ess()->m_transform, m_y, l); } | 1127 void setTransformOriginY(const Length& l) { SET_VAR(rareNonInheritedData.acc
ess()->m_transform, m_y, l); } |
| 1130 void setTransformOriginZ(float f) { SET_VAR(rareNonInheritedData.access()->m
_transform, m_z, f); } | 1128 void setTransformOriginZ(float f) { SET_VAR(rareNonInheritedData.access()->m
_transform, m_z, f); } |
| 1131 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); } | 1129 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); } |
| 1132 void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedD
ata, m_textDecorationColor, c); } | 1130 void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedD
ata, m_textDecorationColor, c); } |
| 1133 void setTextEmphasisColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInh
eritedData, textEmphasisColor, setTextEmphasisColor, c); } | 1131 void setTextEmphasisColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInh
eritedData, textEmphasisColor, setTextEmphasisColor, c); } |
| 1134 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData,
textEmphasisFill, fill); } | 1132 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData,
textEmphasisFill, fill); } |
| 1135 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData,
textEmphasisMark, mark); } | 1133 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData,
textEmphasisMark, mark); } |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1340 static TextOverflow initialTextOverflow() { return TextOverflowClip; } | 1338 static TextOverflow initialTextOverflow() { return TextOverflowClip; } |
| 1341 static EMarginCollapse initialMarginBeforeCollapse() { return MCOLLAPSE; } | 1339 static EMarginCollapse initialMarginBeforeCollapse() { return MCOLLAPSE; } |
| 1342 static EMarginCollapse initialMarginAfterCollapse() { return MCOLLAPSE; } | 1340 static EMarginCollapse initialMarginAfterCollapse() { return MCOLLAPSE; } |
| 1343 static EWordBreak initialWordBreak() { return NormalWordBreak; } | 1341 static EWordBreak initialWordBreak() { return NormalWordBreak; } |
| 1344 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; } | 1342 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; } |
| 1345 static LineBreak initialLineBreak() { return LineBreakAuto; } | 1343 static LineBreak initialLineBreak() { return LineBreakAuto; } |
| 1346 static const AtomicString& initialHighlight() { return nullAtom; } | 1344 static const AtomicString& initialHighlight() { return nullAtom; } |
| 1347 static ESpeak initialSpeak() { return SpeakNormal; } | 1345 static ESpeak initialSpeak() { return SpeakNormal; } |
| 1348 static const AtomicString& initialHyphenationString() { return nullAtom; } | 1346 static const AtomicString& initialHyphenationString() { return nullAtom; } |
| 1349 static const AtomicString& initialLocale() { return nullAtom; } | 1347 static const AtomicString& initialLocale() { return nullAtom; } |
| 1350 static EResize initialResize() { return RESIZE_NONE; } | |
| 1351 static bool initialHasAspectRatio() { return false; } | 1348 static bool initialHasAspectRatio() { return false; } |
| 1352 static float initialAspectRatioDenominator() { return 1; } | 1349 static float initialAspectRatioDenominator() { return 1; } |
| 1353 static float initialAspectRatioNumerator() { return 1; } | 1350 static float initialAspectRatioNumerator() { return 1; } |
| 1354 static Order initialRTLOrdering() { return LogicalOrder; } | 1351 static Order initialRTLOrdering() { return LogicalOrder; } |
| 1355 static float initialTextStrokeWidth() { return 0; } | 1352 static float initialTextStrokeWidth() { return 0; } |
| 1356 static unsigned short initialColumnCount() { return 1; } | 1353 static unsigned short initialColumnCount() { return 1; } |
| 1357 static ColumnFill initialColumnFill() { return ColumnFillBalance; } | 1354 static ColumnFill initialColumnFill() { return ColumnFillBalance; } |
| 1358 static const TransformOperations& initialTransform() { DEFINE_STATIC_LOCAL(T
ransformOperations, ops, ()); return ops; } | 1355 static const TransformOperations& initialTransform() { DEFINE_STATIC_LOCAL(T
ransformOperations, ops, ()); return ops; } |
| 1359 static Length initialTransformOriginX() { return Length(50.0, Percent); } | 1356 static Length initialTransformOriginX() { return Length(50.0, Percent); } |
| 1360 static Length initialTransformOriginY() { return Length(50.0, Percent); } | 1357 static Length initialTransformOriginY() { return Length(50.0, Percent); } |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1524 | 1521 |
| 1525 rareInheritedData.access()->m_textOrientation = textOrientation; | 1522 rareInheritedData.access()->m_textOrientation = textOrientation; |
| 1526 return true; | 1523 return true; |
| 1527 } | 1524 } |
| 1528 | 1525 |
| 1529 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect
::Radii&); | 1526 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect
::Radii&); |
| 1530 | 1527 |
| 1531 } // namespace blink | 1528 } // namespace blink |
| 1532 | 1529 |
| 1533 #endif // RenderStyle_h | 1530 #endif // RenderStyle_h |
| OLD | NEW |