| 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 759 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 770 EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(ra
reNonInheritedData->m_flexibleBox->m_flexDirection); } | 770 EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(ra
reNonInheritedData->m_flexibleBox->m_flexDirection); } |
| 771 bool isColumnFlexDirection() const { return flexDirection() == FlowColumn ||
flexDirection() == FlowColumnReverse; } | 771 bool isColumnFlexDirection() const { return flexDirection() == FlowColumn ||
flexDirection() == FlowColumnReverse; } |
| 772 bool isReverseFlexDirection() const { return flexDirection() == FlowRowRever
se || flexDirection() == FlowColumnReverse; } | 772 bool isReverseFlexDirection() const { return flexDirection() == FlowRowRever
se || flexDirection() == FlowColumnReverse; } |
| 773 EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedD
ata->m_flexibleBox->m_flexWrap); } | 773 EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedD
ata->m_flexibleBox->m_flexWrap); } |
| 774 EJustifyContent justifyContent() const { return static_cast<EJustifyContent>
(rareNonInheritedData->m_justifyContent); } | 774 EJustifyContent justifyContent() const { return static_cast<EJustifyContent>
(rareNonInheritedData->m_justifyContent); } |
| 775 ItemPosition justifySelf() const { return static_cast<ItemPosition>(rareNonI
nheritedData->m_justifySelf); } | 775 ItemPosition justifySelf() const { return static_cast<ItemPosition>(rareNonI
nheritedData->m_justifySelf); } |
| 776 OverflowAlignment justifySelfOverflowAlignment() const { return static_cast<
OverflowAlignment>(rareNonInheritedData->m_justifySelfOverflowAlignment); } | 776 OverflowAlignment justifySelfOverflowAlignment() const { return static_cast<
OverflowAlignment>(rareNonInheritedData->m_justifySelfOverflowAlignment); } |
| 777 | 777 |
| 778 const Vector<GridTrackSize>& gridTemplateColumns() const { return rareNonInh
eritedData->m_grid->m_gridTemplateColumns; } | 778 const Vector<GridTrackSize>& gridTemplateColumns() const { return rareNonInh
eritedData->m_grid->m_gridTemplateColumns; } |
| 779 const Vector<GridTrackSize>& gridTemplateRows() const { return rareNonInheri
tedData->m_grid->m_gridTemplateRows; } | 779 const Vector<GridTrackSize>& gridTemplateRows() const { return rareNonInheri
tedData->m_grid->m_gridTemplateRows; } |
| 780 const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheri
tedData->m_grid->m_namedGridColumnLines; } | |
| 781 const NamedGridLinesMap& namedGridRowLines() const { return rareNonInherited
Data->m_grid->m_namedGridRowLines; } | |
| 782 const OrderedNamedGridLines& orderedNamedGridColumnLines() const { return ra
reNonInheritedData->m_grid->m_orderedNamedGridColumnLines; } | 780 const OrderedNamedGridLines& orderedNamedGridColumnLines() const { return ra
reNonInheritedData->m_grid->m_orderedNamedGridColumnLines; } |
| 783 const OrderedNamedGridLines& orderedNamedGridRowLines() const { return rareN
onInheritedData->m_grid->m_orderedNamedGridRowLines; } | 781 const OrderedNamedGridLines& orderedNamedGridRowLines() const { return rareN
onInheritedData->m_grid->m_orderedNamedGridRowLines; } |
| 784 const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData-
>m_grid->m_namedGridArea; } | 782 const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData-
>m_grid->m_namedGridArea; } |
| 785 size_t namedGridAreaRowCount() const { return rareNonInheritedData->m_grid->
m_namedGridAreaRowCount; } | 783 size_t namedGridAreaRowCount() const { return rareNonInheritedData->m_grid->
m_namedGridAreaRowCount; } |
| 786 size_t namedGridAreaColumnCount() const { return rareNonInheritedData->m_gri
d->m_namedGridAreaColumnCount; } | 784 size_t namedGridAreaColumnCount() const { return rareNonInheritedData->m_gri
d->m_namedGridAreaColumnCount; } |
| 787 GridAutoFlow gridAutoFlow() const { return rareNonInheritedData->m_grid->m_g
ridAutoFlow; } | 785 GridAutoFlow gridAutoFlow() const { return rareNonInheritedData->m_grid->m_g
ridAutoFlow; } |
| 788 const GridTrackSize& gridAutoColumns() const { return rareNonInheritedData->
m_grid->m_gridAutoColumns; } | 786 const GridTrackSize& gridAutoColumns() const { return rareNonInheritedData->
m_grid->m_gridAutoColumns; } |
| 789 const GridTrackSize& gridAutoRows() const { return rareNonInheritedData->m_g
rid->m_gridAutoRows; } | 787 const GridTrackSize& gridAutoRows() const { return rareNonInheritedData->m_g
rid->m_gridAutoRows; } |
| 790 | 788 |
| 791 const GridPosition& gridColumnStart() const { return rareNonInheritedData->m
_gridItem->m_gridColumnStart; } | 789 const GridPosition& gridColumnStart() const { return rareNonInheritedData->m
_gridItem->m_gridColumnStart; } |
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1261 void setAlignSelfOverflowAlignment(OverflowAlignment overflowAlignment) { SE
T_VAR(rareNonInheritedData, m_alignSelfOverflowAlignment, overflowAlignment); } | 1259 void setAlignSelfOverflowAlignment(OverflowAlignment overflowAlignment) { SE
T_VAR(rareNonInheritedData, m_alignSelfOverflowAlignment, overflowAlignment); } |
| 1262 void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedDa
ta.access()->m_flexibleBox, m_flexDirection, direction); } | 1260 void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedDa
ta.access()->m_flexibleBox, m_flexDirection, direction); } |
| 1263 void setFlexWrap(EFlexWrap w) { SET_VAR(rareNonInheritedData.access()->m_fle
xibleBox, m_flexWrap, w); } | 1261 void setFlexWrap(EFlexWrap w) { SET_VAR(rareNonInheritedData.access()->m_fle
xibleBox, m_flexWrap, w); } |
| 1264 void setJustifyContent(EJustifyContent p) { SET_VAR(rareNonInheritedData, m_
justifyContent, p); } | 1262 void setJustifyContent(EJustifyContent p) { SET_VAR(rareNonInheritedData, m_
justifyContent, p); } |
| 1265 void setJustifySelf(ItemPosition justifySelf) { SET_VAR(rareNonInheritedData
, m_justifySelf, justifySelf); } | 1263 void setJustifySelf(ItemPosition justifySelf) { SET_VAR(rareNonInheritedData
, m_justifySelf, justifySelf); } |
| 1266 void setJustifySelfOverflowAlignment(OverflowAlignment overflowAlignment) {
SET_VAR(rareNonInheritedData, m_justifySelfOverflowAlignment, overflowAlignment)
; } | 1264 void setJustifySelfOverflowAlignment(OverflowAlignment overflowAlignment) {
SET_VAR(rareNonInheritedData, m_justifySelfOverflowAlignment, overflowAlignment)
; } |
| 1267 void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheri
tedData.access()->m_grid, m_gridAutoColumns, length); } | 1265 void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheri
tedData.access()->m_grid, m_gridAutoColumns, length); } |
| 1268 void setGridAutoRows(const GridTrackSize& length) { SET_VAR(rareNonInherited
Data.access()->m_grid, m_gridAutoRows, length); } | 1266 void setGridAutoRows(const GridTrackSize& length) { SET_VAR(rareNonInherited
Data.access()->m_grid, m_gridAutoRows, length); } |
| 1269 void setGridTemplateColumns(const Vector<GridTrackSize>& lengths) { SET_VAR(
rareNonInheritedData.access()->m_grid, m_gridTemplateColumns, lengths); } | 1267 void setGridTemplateColumns(const Vector<GridTrackSize>& lengths) { SET_VAR(
rareNonInheritedData.access()->m_grid, m_gridTemplateColumns, lengths); } |
| 1270 void setGridTemplateRows(const Vector<GridTrackSize>& lengths) { SET_VAR(rar
eNonInheritedData.access()->m_grid, m_gridTemplateRows, lengths); } | 1268 void setGridTemplateRows(const Vector<GridTrackSize>& lengths) { SET_VAR(rar
eNonInheritedData.access()->m_grid, m_gridTemplateRows, lengths); } |
| 1271 void setNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines)
{ SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridColumnLines, namedGr
idColumnLines); } | |
| 1272 void setNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_
VAR(rareNonInheritedData.access()->m_grid, m_namedGridRowLines, namedGridRowLine
s); } | |
| 1273 void setOrderedNamedGridColumnLines(const OrderedNamedGridLines& orderedName
dGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedName
dGridColumnLines, orderedNamedGridColumnLines); } | 1269 void setOrderedNamedGridColumnLines(const OrderedNamedGridLines& orderedName
dGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedName
dGridColumnLines, orderedNamedGridColumnLines); } |
| 1274 void setOrderedNamedGridRowLines(const OrderedNamedGridLines& orderedNamedGr
idRowLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedNamedGridR
owLines, orderedNamedGridRowLines); } | 1270 void setOrderedNamedGridRowLines(const OrderedNamedGridLines& orderedNamedGr
idRowLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedNamedGridR
owLines, orderedNamedGridRowLines); } |
| 1275 void setNamedGridArea(const NamedGridAreaMap& namedGridArea) { SET_VAR(rareN
onInheritedData.access()->m_grid, m_namedGridArea, namedGridArea); } | 1271 void setNamedGridArea(const NamedGridAreaMap& namedGridArea) { SET_VAR(rareN
onInheritedData.access()->m_grid, m_namedGridArea, namedGridArea); } |
| 1276 void setNamedGridAreaRowCount(size_t rowCount) { SET_VAR(rareNonInheritedDat
a.access()->m_grid, m_namedGridAreaRowCount, rowCount); } | 1272 void setNamedGridAreaRowCount(size_t rowCount) { SET_VAR(rareNonInheritedDat
a.access()->m_grid, m_namedGridAreaRowCount, rowCount); } |
| 1277 void setNamedGridAreaColumnCount(size_t columnCount) { SET_VAR(rareNonInheri
tedData.access()->m_grid, m_namedGridAreaColumnCount, columnCount); } | 1273 void setNamedGridAreaColumnCount(size_t columnCount) { SET_VAR(rareNonInheri
tedData.access()->m_grid, m_namedGridAreaColumnCount, columnCount); } |
| 1278 void setGridAutoFlow(GridAutoFlow flow) { SET_VAR(rareNonInheritedData.acces
s()->m_grid, m_gridAutoFlow, flow); } | 1274 void setGridAutoFlow(GridAutoFlow flow) { SET_VAR(rareNonInheritedData.acces
s()->m_grid, m_gridAutoFlow, flow); } |
| 1279 | 1275 |
| 1280 void setGridColumnStart(const GridPosition& columnStartPosition) { SET_VAR(r
areNonInheritedData.access()->m_gridItem, m_gridColumnStart, columnStartPosition
); } | 1276 void setGridColumnStart(const GridPosition& columnStartPosition) { SET_VAR(r
areNonInheritedData.access()->m_gridItem, m_gridColumnStart, columnStartPosition
); } |
| 1281 void setGridColumnEnd(const GridPosition& columnEndPosition) { SET_VAR(rareN
onInheritedData.access()->m_gridItem, m_gridColumnEnd, columnEndPosition); } | 1277 void setGridColumnEnd(const GridPosition& columnEndPosition) { SET_VAR(rareN
onInheritedData.access()->m_gridItem, m_gridColumnEnd, columnEndPosition); } |
| 1282 void setGridRowStart(const GridPosition& rowStartPosition) { SET_VAR(rareNon
InheritedData.access()->m_gridItem, m_gridRowStart, rowStartPosition); } | 1278 void setGridRowStart(const GridPosition& rowStartPosition) { SET_VAR(rareNon
InheritedData.access()->m_gridItem, m_gridRowStart, rowStartPosition); } |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1684 | 1680 |
| 1685 // The initial value is 'none' for grid tracks. | 1681 // The initial value is 'none' for grid tracks. |
| 1686 static Vector<GridTrackSize> initialGridTemplateColumns() { return Vector<Gr
idTrackSize>(); } | 1682 static Vector<GridTrackSize> initialGridTemplateColumns() { return Vector<Gr
idTrackSize>(); } |
| 1687 static Vector<GridTrackSize> initialGridTemplateRows() { return Vector<GridT
rackSize>(); } | 1683 static Vector<GridTrackSize> initialGridTemplateRows() { return Vector<GridT
rackSize>(); } |
| 1688 | 1684 |
| 1689 static GridAutoFlow initialGridAutoFlow() { return AutoFlowNone; } | 1685 static GridAutoFlow initialGridAutoFlow() { return AutoFlowNone; } |
| 1690 | 1686 |
| 1691 static GridTrackSize initialGridAutoColumns() { return GridTrackSize(Length(
Auto)); } | 1687 static GridTrackSize initialGridAutoColumns() { return GridTrackSize(Length(
Auto)); } |
| 1692 static GridTrackSize initialGridAutoRows() { return GridTrackSize(Length(Aut
o)); } | 1688 static GridTrackSize initialGridAutoRows() { return GridTrackSize(Length(Aut
o)); } |
| 1693 | 1689 |
| 1694 static NamedGridLinesMap initialNamedGridColumnLines() { return NamedGridLin
esMap(); } | |
| 1695 static NamedGridLinesMap initialNamedGridRowLines() { return NamedGridLinesM
ap(); } | |
| 1696 | |
| 1697 static OrderedNamedGridLines initialOrderedNamedGridColumnLines() { return O
rderedNamedGridLines(); } | 1690 static OrderedNamedGridLines initialOrderedNamedGridColumnLines() { return O
rderedNamedGridLines(); } |
| 1698 static OrderedNamedGridLines initialOrderedNamedGridRowLines() { return Orde
redNamedGridLines(); } | 1691 static OrderedNamedGridLines initialOrderedNamedGridRowLines() { return Orde
redNamedGridLines(); } |
| 1699 | 1692 |
| 1700 static NamedGridAreaMap initialNamedGridArea() { return NamedGridAreaMap();
} | 1693 static NamedGridAreaMap initialNamedGridArea() { return NamedGridAreaMap();
} |
| 1701 static size_t initialNamedGridAreaCount() { return 0; } | 1694 static size_t initialNamedGridAreaCount() { return 0; } |
| 1702 | 1695 |
| 1703 // 'auto' is the default. | 1696 // 'auto' is the default. |
| 1704 static GridPosition initialGridColumnStart() { return GridPosition(); } | 1697 static GridPosition initialGridColumnStart() { return GridPosition(); } |
| 1705 static GridPosition initialGridColumnEnd() { return GridPosition(); } | 1698 static GridPosition initialGridColumnEnd() { return GridPosition(); } |
| 1706 static GridPosition initialGridRowStart() { return GridPosition(); } | 1699 static GridPosition initialGridRowStart() { return GridPosition(); } |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1883 inline bool RenderStyle::hasPseudoElementStyle() const | 1876 inline bool RenderStyle::hasPseudoElementStyle() const |
| 1884 { | 1877 { |
| 1885 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK; | 1878 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK; |
| 1886 } | 1879 } |
| 1887 | 1880 |
| 1888 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect
::Radii&); | 1881 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect
::Radii&); |
| 1889 | 1882 |
| 1890 } // namespace WebCore | 1883 } // namespace WebCore |
| 1891 | 1884 |
| 1892 #endif // RenderStyle_h | 1885 #endif // RenderStyle_h |
| OLD | NEW |