| 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 30 matching lines...) Expand all Loading... |
| 41 #include "core/rendering/style/ShapeValue.h" | 41 #include "core/rendering/style/ShapeValue.h" |
| 42 #include "core/rendering/style/StyleBackgroundData.h" | 42 #include "core/rendering/style/StyleBackgroundData.h" |
| 43 #include "core/rendering/style/StyleBoxData.h" | 43 #include "core/rendering/style/StyleBoxData.h" |
| 44 #include "core/rendering/style/StyleDeprecatedFlexibleBoxData.h" | 44 #include "core/rendering/style/StyleDeprecatedFlexibleBoxData.h" |
| 45 #include "core/rendering/style/StyleDifference.h" | 45 #include "core/rendering/style/StyleDifference.h" |
| 46 #include "core/rendering/style/StyleFilterData.h" | 46 #include "core/rendering/style/StyleFilterData.h" |
| 47 #include "core/rendering/style/StyleFlexibleBoxData.h" | 47 #include "core/rendering/style/StyleFlexibleBoxData.h" |
| 48 #include "core/rendering/style/StyleGridData.h" | 48 #include "core/rendering/style/StyleGridData.h" |
| 49 #include "core/rendering/style/StyleGridItemData.h" | 49 #include "core/rendering/style/StyleGridItemData.h" |
| 50 #include "core/rendering/style/StyleInheritedData.h" | 50 #include "core/rendering/style/StyleInheritedData.h" |
| 51 #include "core/rendering/style/StyleMarqueeData.h" | |
| 52 #include "core/rendering/style/StyleMultiColData.h" | 51 #include "core/rendering/style/StyleMultiColData.h" |
| 53 #include "core/rendering/style/StyleRareInheritedData.h" | 52 #include "core/rendering/style/StyleRareInheritedData.h" |
| 54 #include "core/rendering/style/StyleRareNonInheritedData.h" | 53 #include "core/rendering/style/StyleRareNonInheritedData.h" |
| 55 #include "core/rendering/style/StyleReflection.h" | 54 #include "core/rendering/style/StyleReflection.h" |
| 56 #include "core/rendering/style/StyleSurroundData.h" | 55 #include "core/rendering/style/StyleSurroundData.h" |
| 57 #include "core/rendering/style/StyleTransformData.h" | 56 #include "core/rendering/style/StyleTransformData.h" |
| 58 #include "core/rendering/style/StyleVisualData.h" | 57 #include "core/rendering/style/StyleVisualData.h" |
| 59 #include "core/rendering/style/StyleWillChangeData.h" | 58 #include "core/rendering/style/StyleWillChangeData.h" |
| 60 #include "core/rendering/style/TransformOrigin.h" | 59 #include "core/rendering/style/TransformOrigin.h" |
| 61 #include "platform/Length.h" | 60 #include "platform/Length.h" |
| (...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 807 | 806 |
| 808 EBoxDecorationBreak boxDecorationBreak() const { return m_box->boxDecoration
Break(); } | 807 EBoxDecorationBreak boxDecorationBreak() const { return m_box->boxDecoration
Break(); } |
| 809 StyleReflection* boxReflect() const { return rareNonInheritedData->m_boxRefl
ect.get(); } | 808 StyleReflection* boxReflect() const { return rareNonInheritedData->m_boxRefl
ect.get(); } |
| 810 bool reflectionDataEquivalent(const RenderStyle* otherStyle) const { return
rareNonInheritedData->reflectionDataEquivalent(*otherStyle->rareNonInheritedData
); } | 809 bool reflectionDataEquivalent(const RenderStyle* otherStyle) const { return
rareNonInheritedData->reflectionDataEquivalent(*otherStyle->rareNonInheritedData
); } |
| 811 | 810 |
| 812 // FIXME: reflections should belong to this helper function but they are cur
rently handled | 811 // FIXME: reflections should belong to this helper function but they are cur
rently handled |
| 813 // through their self-painting layers. So the rendering code doesn't account
for them. | 812 // through their self-painting layers. So the rendering code doesn't account
for them. |
| 814 bool hasVisualOverflowingEffect() const { return boxShadow() || hasBorderIma
geOutsets() || hasOutline(); } | 813 bool hasVisualOverflowingEffect() const { return boxShadow() || hasBorderIma
geOutsets() || hasOutline(); } |
| 815 | 814 |
| 816 EBoxSizing boxSizing() const { return m_box->boxSizing(); } | 815 EBoxSizing boxSizing() const { return m_box->boxSizing(); } |
| 817 const Length& marqueeIncrement() const { return rareNonInheritedData->m_marq
uee->increment; } | |
| 818 int marqueeSpeed() const { return rareNonInheritedData->m_marquee->speed; } | |
| 819 int marqueeLoopCount() const { return rareNonInheritedData->m_marquee->loops
; } | |
| 820 EMarqueeBehavior marqueeBehavior() const { return static_cast<EMarqueeBehavi
or>(rareNonInheritedData->m_marquee->behavior); } | |
| 821 EMarqueeDirection marqueeDirection() const { return static_cast<EMarqueeDire
ction>(rareNonInheritedData->m_marquee->direction); } | |
| 822 EUserModify userModify() const { return static_cast<EUserModify>(rareInherit
edData->userModify); } | 816 EUserModify userModify() const { return static_cast<EUserModify>(rareInherit
edData->userModify); } |
| 823 EUserDrag userDrag() const { return static_cast<EUserDrag>(rareNonInheritedD
ata->userDrag); } | 817 EUserDrag userDrag() const { return static_cast<EUserDrag>(rareNonInheritedD
ata->userDrag); } |
| 824 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit
edData->userSelect); } | 818 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit
edData->userSelect); } |
| 825 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon
InheritedData->textOverflow); } | 819 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon
InheritedData->textOverflow); } |
| 826 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol
lapse>(rareNonInheritedData->marginBeforeCollapse); } | 820 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol
lapse>(rareNonInheritedData->marginBeforeCollapse); } |
| 827 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl
apse>(rareNonInheritedData->marginAfterCollapse); } | 821 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl
apse>(rareNonInheritedData->marginAfterCollapse); } |
| 828 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD
ata->wordBreak); } | 822 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD
ata->wordBreak); } |
| 829 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI
nheritedData->overflowWrap); } | 823 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI
nheritedData->overflowWrap); } |
| 830 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat
a->lineBreak); } | 824 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat
a->lineBreak); } |
| 831 const AtomicString& highlight() const { return rareInheritedData->highlight;
} | 825 const AtomicString& highlight() const { return rareInheritedData->highlight;
} |
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1290 void setNamedGridArea(const NamedGridAreaMap& namedGridArea) { SET_VAR(rareN
onInheritedData.access()->m_grid, m_namedGridArea, namedGridArea); } | 1284 void setNamedGridArea(const NamedGridAreaMap& namedGridArea) { SET_VAR(rareN
onInheritedData.access()->m_grid, m_namedGridArea, namedGridArea); } |
| 1291 void setNamedGridAreaRowCount(size_t rowCount) { SET_VAR(rareNonInheritedDat
a.access()->m_grid, m_namedGridAreaRowCount, rowCount); } | 1285 void setNamedGridAreaRowCount(size_t rowCount) { SET_VAR(rareNonInheritedDat
a.access()->m_grid, m_namedGridAreaRowCount, rowCount); } |
| 1292 void setNamedGridAreaColumnCount(size_t columnCount) { SET_VAR(rareNonInheri
tedData.access()->m_grid, m_namedGridAreaColumnCount, columnCount); } | 1286 void setNamedGridAreaColumnCount(size_t columnCount) { SET_VAR(rareNonInheri
tedData.access()->m_grid, m_namedGridAreaColumnCount, columnCount); } |
| 1293 void setGridAutoFlow(GridAutoFlow flow) { SET_VAR(rareNonInheritedData.acces
s()->m_grid, m_gridAutoFlow, flow); } | 1287 void setGridAutoFlow(GridAutoFlow flow) { SET_VAR(rareNonInheritedData.acces
s()->m_grid, m_gridAutoFlow, flow); } |
| 1294 | 1288 |
| 1295 void setGridColumnStart(const GridPosition& columnStartPosition) { SET_VAR(r
areNonInheritedData.access()->m_gridItem, m_gridColumnStart, columnStartPosition
); } | 1289 void setGridColumnStart(const GridPosition& columnStartPosition) { SET_VAR(r
areNonInheritedData.access()->m_gridItem, m_gridColumnStart, columnStartPosition
); } |
| 1296 void setGridColumnEnd(const GridPosition& columnEndPosition) { SET_VAR(rareN
onInheritedData.access()->m_gridItem, m_gridColumnEnd, columnEndPosition); } | 1290 void setGridColumnEnd(const GridPosition& columnEndPosition) { SET_VAR(rareN
onInheritedData.access()->m_gridItem, m_gridColumnEnd, columnEndPosition); } |
| 1297 void setGridRowStart(const GridPosition& rowStartPosition) { SET_VAR(rareNon
InheritedData.access()->m_gridItem, m_gridRowStart, rowStartPosition); } | 1291 void setGridRowStart(const GridPosition& rowStartPosition) { SET_VAR(rareNon
InheritedData.access()->m_gridItem, m_gridRowStart, rowStartPosition); } |
| 1298 void setGridRowEnd(const GridPosition& rowEndPosition) { SET_VAR(rareNonInhe
ritedData.access()->m_gridItem, m_gridRowEnd, rowEndPosition); } | 1292 void setGridRowEnd(const GridPosition& rowEndPosition) { SET_VAR(rareNonInhe
ritedData.access()->m_gridItem, m_gridRowEnd, rowEndPosition); } |
| 1299 | 1293 |
| 1300 void setMarqueeIncrement(const Length& f) { SET_VAR(rareNonInheritedData.acc
ess()->m_marquee, increment, f); } | |
| 1301 void setMarqueeSpeed(int f) { SET_VAR(rareNonInheritedData.access()->m_marqu
ee, speed, f); } | |
| 1302 void setMarqueeDirection(EMarqueeDirection d) { SET_VAR(rareNonInheritedData
.access()->m_marquee, direction, d); } | |
| 1303 void setMarqueeBehavior(EMarqueeBehavior b) { SET_VAR(rareNonInheritedData.a
ccess()->m_marquee, behavior, b); } | |
| 1304 void setMarqueeLoopCount(int i) { SET_VAR(rareNonInheritedData.access()->m_m
arquee, loops, i); } | |
| 1305 void setUserModify(EUserModify u) { SET_VAR(rareInheritedData, userModify, u
); } | 1294 void setUserModify(EUserModify u) { SET_VAR(rareInheritedData, userModify, u
); } |
| 1306 void setUserDrag(EUserDrag d) { SET_VAR(rareNonInheritedData, userDrag, d);
} | 1295 void setUserDrag(EUserDrag d) { SET_VAR(rareNonInheritedData, userDrag, d);
} |
| 1307 void setUserSelect(EUserSelect s) { SET_VAR(rareInheritedData, userSelect, s
); } | 1296 void setUserSelect(EUserSelect s) { SET_VAR(rareInheritedData, userSelect, s
); } |
| 1308 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData,
textOverflow, overflow); } | 1297 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData,
textOverflow, overflow); } |
| 1309 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa
ta, marginBeforeCollapse, c); } | 1298 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa
ta, marginBeforeCollapse, c); } |
| 1310 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat
a, marginAfterCollapse, c); } | 1299 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat
a, marginAfterCollapse, c); } |
| 1311 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b);
} | 1300 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b);
} |
| 1312 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW
rap, b); } | 1301 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW
rap, b); } |
| 1313 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); } | 1302 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); } |
| 1314 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli
ght, h); } | 1303 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli
ght, h); } |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1618 static ItemPosition initialAlignSelf() { return ItemPositionAuto; } | 1607 static ItemPosition initialAlignSelf() { return ItemPositionAuto; } |
| 1619 static OverflowAlignment initialAlignSelfOverflowAlignment() { return Overfl
owAlignmentDefault; } | 1608 static OverflowAlignment initialAlignSelfOverflowAlignment() { return Overfl
owAlignmentDefault; } |
| 1620 static EFlexDirection initialFlexDirection() { return FlowRow; } | 1609 static EFlexDirection initialFlexDirection() { return FlowRow; } |
| 1621 static EFlexWrap initialFlexWrap() { return FlexNoWrap; } | 1610 static EFlexWrap initialFlexWrap() { return FlexNoWrap; } |
| 1622 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; } | 1611 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; } |
| 1623 static ItemPosition initialJustifyItems() { return ItemPositionAuto; } | 1612 static ItemPosition initialJustifyItems() { return ItemPositionAuto; } |
| 1624 static OverflowAlignment initialJustifyItemsOverflowAlignment() { return Ove
rflowAlignmentDefault; } | 1613 static OverflowAlignment initialJustifyItemsOverflowAlignment() { return Ove
rflowAlignmentDefault; } |
| 1625 static ItemPositionType initialJustifyItemsPositionType() { return NonLegacy
Position; } | 1614 static ItemPositionType initialJustifyItemsPositionType() { return NonLegacy
Position; } |
| 1626 static ItemPosition initialJustifySelf() { return ItemPositionAuto; } | 1615 static ItemPosition initialJustifySelf() { return ItemPositionAuto; } |
| 1627 static OverflowAlignment initialJustifySelfOverflowAlignment() { return Over
flowAlignmentDefault; } | 1616 static OverflowAlignment initialJustifySelfOverflowAlignment() { return Over
flowAlignmentDefault; } |
| 1628 static int initialMarqueeLoopCount() { return -1; } | |
| 1629 static int initialMarqueeSpeed() { return 85; } | |
| 1630 static Length initialMarqueeIncrement() { return Length(6, Fixed); } | |
| 1631 static EMarqueeBehavior initialMarqueeBehavior() { return MSCROLL; } | |
| 1632 static EMarqueeDirection initialMarqueeDirection() { return MAUTO; } | |
| 1633 static EUserModify initialUserModify() { return READ_ONLY; } | 1617 static EUserModify initialUserModify() { return READ_ONLY; } |
| 1634 static EUserDrag initialUserDrag() { return DRAG_AUTO; } | 1618 static EUserDrag initialUserDrag() { return DRAG_AUTO; } |
| 1635 static EUserSelect initialUserSelect() { return SELECT_TEXT; } | 1619 static EUserSelect initialUserSelect() { return SELECT_TEXT; } |
| 1636 static TextOverflow initialTextOverflow() { return TextOverflowClip; } | 1620 static TextOverflow initialTextOverflow() { return TextOverflowClip; } |
| 1637 static EMarginCollapse initialMarginBeforeCollapse() { return MCOLLAPSE; } | 1621 static EMarginCollapse initialMarginBeforeCollapse() { return MCOLLAPSE; } |
| 1638 static EMarginCollapse initialMarginAfterCollapse() { return MCOLLAPSE; } | 1622 static EMarginCollapse initialMarginAfterCollapse() { return MCOLLAPSE; } |
| 1639 static EWordBreak initialWordBreak() { return NormalWordBreak; } | 1623 static EWordBreak initialWordBreak() { return NormalWordBreak; } |
| 1640 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; } | 1624 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; } |
| 1641 static LineBreak initialLineBreak() { return LineBreakAuto; } | 1625 static LineBreak initialLineBreak() { return LineBreakAuto; } |
| 1642 static const AtomicString& initialHighlight() { return nullAtom; } | 1626 static const AtomicString& initialHighlight() { return nullAtom; } |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1918 inline bool RenderStyle::hasPseudoElementStyle() const | 1902 inline bool RenderStyle::hasPseudoElementStyle() const |
| 1919 { | 1903 { |
| 1920 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; | 1904 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; |
| 1921 } | 1905 } |
| 1922 | 1906 |
| 1923 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect
::Radii&); | 1907 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect
::Radii&); |
| 1924 | 1908 |
| 1925 } // namespace blink | 1909 } // namespace blink |
| 1926 | 1910 |
| 1927 #endif // RenderStyle_h | 1911 #endif // RenderStyle_h |
| OLD | NEW |