| Index: sky/engine/core/rendering/style/RenderStyle.h
|
| diff --git a/sky/engine/core/rendering/style/RenderStyle.h b/sky/engine/core/rendering/style/RenderStyle.h
|
| index 69d1b53b057107ab8992bddeb1d2ae67986198f0..b2859f642e0ac4999984d8c9514ac8421a21c459 100644
|
| --- a/sky/engine/core/rendering/style/RenderStyle.h
|
| +++ b/sky/engine/core/rendering/style/RenderStyle.h
|
| @@ -43,8 +43,6 @@
|
| #include "core/rendering/style/StyleDifference.h"
|
| #include "core/rendering/style/StyleFilterData.h"
|
| #include "core/rendering/style/StyleFlexibleBoxData.h"
|
| -#include "core/rendering/style/StyleGridData.h"
|
| -#include "core/rendering/style/StyleGridItemData.h"
|
| #include "core/rendering/style/StyleInheritedData.h"
|
| #include "core/rendering/style/StyleRareInheritedData.h"
|
| #include "core/rendering/style/StyleRareNonInheritedData.h"
|
| @@ -707,29 +705,6 @@ public:
|
| ItemPosition justifySelf() const { return static_cast<ItemPosition>(rareNonInheritedData->m_justifySelf); }
|
| OverflowAlignment justifySelfOverflowAlignment() const { return static_cast<OverflowAlignment>(rareNonInheritedData->m_justifySelfOverflowAlignment); }
|
|
|
| - const Vector<GridTrackSize>& gridTemplateColumns() const { return rareNonInheritedData->m_grid->m_gridTemplateColumns; }
|
| - const Vector<GridTrackSize>& gridTemplateRows() const { return rareNonInheritedData->m_grid->m_gridTemplateRows; }
|
| - const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheritedData->m_grid->m_namedGridColumnLines; }
|
| - const NamedGridLinesMap& namedGridRowLines() const { return rareNonInheritedData->m_grid->m_namedGridRowLines; }
|
| - const OrderedNamedGridLines& orderedNamedGridColumnLines() const { return rareNonInheritedData->m_grid->m_orderedNamedGridColumnLines; }
|
| - const OrderedNamedGridLines& orderedNamedGridRowLines() const { return rareNonInheritedData->m_grid->m_orderedNamedGridRowLines; }
|
| - const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData->m_grid->m_namedGridArea; }
|
| - size_t namedGridAreaRowCount() const { return rareNonInheritedData->m_grid->m_namedGridAreaRowCount; }
|
| - size_t namedGridAreaColumnCount() const { return rareNonInheritedData->m_grid->m_namedGridAreaColumnCount; }
|
| - GridAutoFlow gridAutoFlow() const { return static_cast<GridAutoFlow>(rareNonInheritedData->m_grid->m_gridAutoFlow); }
|
| - bool isGridAutoFlowDirectionRow() const { return (rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowDirectionRow) == InternalAutoFlowDirectionRow; }
|
| - bool isGridAutoFlowDirectionColumn() const { return (rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowDirectionColumn) == InternalAutoFlowDirectionColumn; }
|
| - bool isGridAutoFlowAlgorithmSparse() const { return (rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowAlgorithmSparse) == InternalAutoFlowAlgorithmSparse; }
|
| - bool isGridAutoFlowAlgorithmDense() const { return (rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowAlgorithmDense) == InternalAutoFlowAlgorithmDense; }
|
| - bool isGridAutoFlowAlgorithmStack() const { return (rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowAlgorithmStack) == InternalAutoFlowAlgorithmStack; }
|
| - const GridTrackSize& gridAutoColumns() const { return rareNonInheritedData->m_grid->m_gridAutoColumns; }
|
| - const GridTrackSize& gridAutoRows() const { return rareNonInheritedData->m_grid->m_gridAutoRows; }
|
| -
|
| - const GridPosition& gridColumnStart() const { return rareNonInheritedData->m_gridItem->m_gridColumnStart; }
|
| - const GridPosition& gridColumnEnd() const { return rareNonInheritedData->m_gridItem->m_gridColumnEnd; }
|
| - const GridPosition& gridRowStart() const { return rareNonInheritedData->m_gridItem->m_gridRowStart; }
|
| - const GridPosition& gridRowEnd() const { return rareNonInheritedData->m_gridItem->m_gridRowEnd; }
|
| -
|
| ShadowList* boxShadow() const { return rareNonInheritedData->m_boxShadow.get(); }
|
| void getBoxShadowExtent(LayoutUnit& top, LayoutUnit& right, LayoutUnit& bottom, LayoutUnit& left) const { getShadowExtent(boxShadow(), top, right, bottom, left); }
|
| LayoutBoxExtent getBoxShadowInsetExtent() const { return getShadowInsetExtent(boxShadow()); }
|
| @@ -1144,23 +1119,6 @@ public:
|
| void setJustifyItemsPositionType(ItemPositionType positionType) { SET_VAR(rareNonInheritedData, m_justifyItemsPositionType, positionType); }
|
| void setJustifySelf(ItemPosition justifySelf) { SET_VAR(rareNonInheritedData, m_justifySelf, justifySelf); }
|
| void setJustifySelfOverflowAlignment(OverflowAlignment overflowAlignment) { SET_VAR(rareNonInheritedData, m_justifySelfOverflowAlignment, overflowAlignment); }
|
| - void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridAutoColumns, length); }
|
| - void setGridAutoRows(const GridTrackSize& length) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridAutoRows, length); }
|
| - void setGridTemplateColumns(const Vector<GridTrackSize>& lengths) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridTemplateColumns, lengths); }
|
| - void setGridTemplateRows(const Vector<GridTrackSize>& lengths) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridTemplateRows, lengths); }
|
| - void setNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridColumnLines, namedGridColumnLines); }
|
| - void setNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridRowLines, namedGridRowLines); }
|
| - void setOrderedNamedGridColumnLines(const OrderedNamedGridLines& orderedNamedGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedNamedGridColumnLines, orderedNamedGridColumnLines); }
|
| - void setOrderedNamedGridRowLines(const OrderedNamedGridLines& orderedNamedGridRowLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedNamedGridRowLines, orderedNamedGridRowLines); }
|
| - void setNamedGridArea(const NamedGridAreaMap& namedGridArea) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridArea, namedGridArea); }
|
| - void setNamedGridAreaRowCount(size_t rowCount) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridAreaRowCount, rowCount); }
|
| - void setNamedGridAreaColumnCount(size_t columnCount) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridAreaColumnCount, columnCount); }
|
| - void setGridAutoFlow(GridAutoFlow flow) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridAutoFlow, flow); }
|
| -
|
| - void setGridColumnStart(const GridPosition& columnStartPosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridColumnStart, columnStartPosition); }
|
| - void setGridColumnEnd(const GridPosition& columnEndPosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridColumnEnd, columnEndPosition); }
|
| - void setGridRowStart(const GridPosition& rowStartPosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridRowStart, rowStartPosition); }
|
| - void setGridRowEnd(const GridPosition& rowEndPosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridRowEnd, rowEndPosition); }
|
|
|
| void setUserModify(EUserModify u) { SET_VAR(rareInheritedData, userModify, u); }
|
| void setUserDrag(EUserDrag d) { SET_VAR(rareNonInheritedData, userDrag, d); }
|
| @@ -1301,7 +1259,7 @@ public:
|
| bool isDisplayReplacedType() const { return isDisplayReplacedType(display()); }
|
| bool isDisplayInlineType() const { return isDisplayInlineType(display()); }
|
| bool isOriginalDisplayInlineType() const { return isDisplayInlineType(originalDisplay()); }
|
| - bool isDisplayFlexibleOrGridBox() const { return isDisplayFlexibleBox(display()) || isDisplayGridBox(display()); }
|
| + bool isDisplayFlexibleBox() const { return isDisplayFlexibleBox(display()); }
|
|
|
| // A unique style is one that has matches something that makes it impossible to share.
|
| bool unique() const { return noninherited_flags.unique; }
|
| @@ -1462,30 +1420,6 @@ public:
|
| static ShadowList* initialTextShadow() { return 0; }
|
| static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorInstant; }
|
|
|
| - // The initial value is 'none' for grid tracks.
|
| - static Vector<GridTrackSize> initialGridTemplateColumns() { return Vector<GridTrackSize>(); }
|
| - static Vector<GridTrackSize> initialGridTemplateRows() { return Vector<GridTrackSize>(); }
|
| -
|
| - static GridAutoFlow initialGridAutoFlow() { return AutoFlowRow; }
|
| -
|
| - static GridTrackSize initialGridAutoColumns() { return GridTrackSize(Length(Auto)); }
|
| - static GridTrackSize initialGridAutoRows() { return GridTrackSize(Length(Auto)); }
|
| -
|
| - static NamedGridLinesMap initialNamedGridColumnLines() { return NamedGridLinesMap(); }
|
| - static NamedGridLinesMap initialNamedGridRowLines() { return NamedGridLinesMap(); }
|
| -
|
| - static OrderedNamedGridLines initialOrderedNamedGridColumnLines() { return OrderedNamedGridLines(); }
|
| - static OrderedNamedGridLines initialOrderedNamedGridRowLines() { return OrderedNamedGridLines(); }
|
| -
|
| - static NamedGridAreaMap initialNamedGridArea() { return NamedGridAreaMap(); }
|
| - static size_t initialNamedGridAreaCount() { return 0; }
|
| -
|
| - // 'auto' is the default.
|
| - static GridPosition initialGridColumnStart() { return GridPosition(); }
|
| - static GridPosition initialGridColumnEnd() { return GridPosition(); }
|
| - static GridPosition initialGridRowStart() { return GridPosition(); }
|
| - static GridPosition initialGridRowEnd() { return GridPosition(); }
|
| -
|
| static unsigned initialTabSize() { return 8; }
|
|
|
| static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
|
| @@ -1523,14 +1457,9 @@ private:
|
| return display == FLEX || display == INLINE_FLEX;
|
| }
|
|
|
| - bool isDisplayGridBox(EDisplay display) const
|
| - {
|
| - return display == GRID || display == INLINE_GRID;
|
| - }
|
| -
|
| bool isDisplayReplacedType(EDisplay display) const
|
| {
|
| - return display == INLINE_BLOCK || display == INLINE_FLEX || display == INLINE_GRID;
|
| + return display == INLINE_BLOCK || display == INLINE_FLEX;
|
| }
|
|
|
| bool isDisplayInlineType(EDisplay display) const
|
|
|