Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Side by Side Diff: Source/core/style/ComputedStyle.h

Issue 1309513008: [css-grid] Implement grid gutters (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed two tests which were not testing gutters code Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 773 matching lines...) Expand 10 before | Expand all | Expand 10 after
784 const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData- >m_grid->m_namedGridArea; } 784 const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData- >m_grid->m_namedGridArea; }
785 size_t namedGridAreaRowCount() const { return rareNonInheritedData->m_grid-> m_namedGridAreaRowCount; } 785 size_t namedGridAreaRowCount() const { return rareNonInheritedData->m_grid-> m_namedGridAreaRowCount; }
786 size_t namedGridAreaColumnCount() const { return rareNonInheritedData->m_gri d->m_namedGridAreaColumnCount; } 786 size_t namedGridAreaColumnCount() const { return rareNonInheritedData->m_gri d->m_namedGridAreaColumnCount; }
787 GridAutoFlow gridAutoFlow() const { return static_cast<GridAutoFlow>(rareNon InheritedData->m_grid->m_gridAutoFlow); } 787 GridAutoFlow gridAutoFlow() const { return static_cast<GridAutoFlow>(rareNon InheritedData->m_grid->m_gridAutoFlow); }
788 bool isGridAutoFlowDirectionRow() const { return (rareNonInheritedData->m_gr id->m_gridAutoFlow & InternalAutoFlowDirectionRow) == InternalAutoFlowDirectionR ow; } 788 bool isGridAutoFlowDirectionRow() const { return (rareNonInheritedData->m_gr id->m_gridAutoFlow & InternalAutoFlowDirectionRow) == InternalAutoFlowDirectionR ow; }
789 bool isGridAutoFlowDirectionColumn() const { return (rareNonInheritedData->m _grid->m_gridAutoFlow & InternalAutoFlowDirectionColumn) == InternalAutoFlowDire ctionColumn; } 789 bool isGridAutoFlowDirectionColumn() const { return (rareNonInheritedData->m _grid->m_gridAutoFlow & InternalAutoFlowDirectionColumn) == InternalAutoFlowDire ctionColumn; }
790 bool isGridAutoFlowAlgorithmSparse() const { return (rareNonInheritedData->m _grid->m_gridAutoFlow & InternalAutoFlowAlgorithmSparse) == InternalAutoFlowAlgo rithmSparse; } 790 bool isGridAutoFlowAlgorithmSparse() const { return (rareNonInheritedData->m _grid->m_gridAutoFlow & InternalAutoFlowAlgorithmSparse) == InternalAutoFlowAlgo rithmSparse; }
791 bool isGridAutoFlowAlgorithmDense() const { return (rareNonInheritedData->m_ grid->m_gridAutoFlow & InternalAutoFlowAlgorithmDense) == InternalAutoFlowAlgori thmDense; } 791 bool isGridAutoFlowAlgorithmDense() const { return (rareNonInheritedData->m_ grid->m_gridAutoFlow & InternalAutoFlowAlgorithmDense) == InternalAutoFlowAlgori thmDense; }
792 const GridTrackSize& gridAutoColumns() const { return rareNonInheritedData-> m_grid->m_gridAutoColumns; } 792 const GridTrackSize& gridAutoColumns() const { return rareNonInheritedData-> m_grid->m_gridAutoColumns; }
793 const GridTrackSize& gridAutoRows() const { return rareNonInheritedData->m_g rid->m_gridAutoRows; } 793 const GridTrackSize& gridAutoRows() const { return rareNonInheritedData->m_g rid->m_gridAutoRows; }
794 const Length& gridColumnGap() const { return rareNonInheritedData->m_grid->m _gridColumnGap; }
795 const Length& gridRowGap() const { return rareNonInheritedData->m_grid->m_gr idRowGap; }
796
794 797
795 const GridPosition& gridColumnStart() const { return rareNonInheritedData->m _gridItem->m_gridColumnStart; } 798 const GridPosition& gridColumnStart() const { return rareNonInheritedData->m _gridItem->m_gridColumnStart; }
796 const GridPosition& gridColumnEnd() const { return rareNonInheritedData->m_g ridItem->m_gridColumnEnd; } 799 const GridPosition& gridColumnEnd() const { return rareNonInheritedData->m_g ridItem->m_gridColumnEnd; }
797 const GridPosition& gridRowStart() const { return rareNonInheritedData->m_gr idItem->m_gridRowStart; } 800 const GridPosition& gridRowStart() const { return rareNonInheritedData->m_gr idItem->m_gridRowStart; }
798 const GridPosition& gridRowEnd() const { return rareNonInheritedData->m_grid Item->m_gridRowEnd; } 801 const GridPosition& gridRowEnd() const { return rareNonInheritedData->m_grid Item->m_gridRowEnd; }
799 802
800 ShadowList* boxShadow() const { return rareNonInheritedData->m_boxShadow.get (); } 803 ShadowList* boxShadow() const { return rareNonInheritedData->m_boxShadow.get (); }
801 804
802 EBoxDecorationBreak boxDecorationBreak() const { return m_box->boxDecoration Break(); } 805 EBoxDecorationBreak boxDecorationBreak() const { return m_box->boxDecoration Break(); }
803 StyleReflection* boxReflect() const { return rareNonInheritedData->m_boxRefl ect.get(); } 806 StyleReflection* boxReflect() const { return rareNonInheritedData->m_boxRefl ect.get(); }
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
1311 void setOrderedNamedGridRowLines(const OrderedNamedGridLines& orderedNamedGr idRowLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedNamedGridR owLines, orderedNamedGridRowLines); } 1314 void setOrderedNamedGridRowLines(const OrderedNamedGridLines& orderedNamedGr idRowLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedNamedGridR owLines, orderedNamedGridRowLines); }
1312 void setNamedGridArea(const NamedGridAreaMap& namedGridArea) { SET_VAR(rareN onInheritedData.access()->m_grid, m_namedGridArea, namedGridArea); } 1315 void setNamedGridArea(const NamedGridAreaMap& namedGridArea) { SET_VAR(rareN onInheritedData.access()->m_grid, m_namedGridArea, namedGridArea); }
1313 void setNamedGridAreaRowCount(size_t rowCount) { SET_VAR(rareNonInheritedDat a.access()->m_grid, m_namedGridAreaRowCount, rowCount); } 1316 void setNamedGridAreaRowCount(size_t rowCount) { SET_VAR(rareNonInheritedDat a.access()->m_grid, m_namedGridAreaRowCount, rowCount); }
1314 void setNamedGridAreaColumnCount(size_t columnCount) { SET_VAR(rareNonInheri tedData.access()->m_grid, m_namedGridAreaColumnCount, columnCount); } 1317 void setNamedGridAreaColumnCount(size_t columnCount) { SET_VAR(rareNonInheri tedData.access()->m_grid, m_namedGridAreaColumnCount, columnCount); }
1315 void setGridAutoFlow(GridAutoFlow flow) { SET_VAR(rareNonInheritedData.acces s()->m_grid, m_gridAutoFlow, flow); } 1318 void setGridAutoFlow(GridAutoFlow flow) { SET_VAR(rareNonInheritedData.acces s()->m_grid, m_gridAutoFlow, flow); }
1316 1319
1317 void setGridColumnStart(const GridPosition& columnStartPosition) { SET_VAR(r areNonInheritedData.access()->m_gridItem, m_gridColumnStart, columnStartPosition ); } 1320 void setGridColumnStart(const GridPosition& columnStartPosition) { SET_VAR(r areNonInheritedData.access()->m_gridItem, m_gridColumnStart, columnStartPosition ); }
1318 void setGridColumnEnd(const GridPosition& columnEndPosition) { SET_VAR(rareN onInheritedData.access()->m_gridItem, m_gridColumnEnd, columnEndPosition); } 1321 void setGridColumnEnd(const GridPosition& columnEndPosition) { SET_VAR(rareN onInheritedData.access()->m_gridItem, m_gridColumnEnd, columnEndPosition); }
1319 void setGridRowStart(const GridPosition& rowStartPosition) { SET_VAR(rareNon InheritedData.access()->m_gridItem, m_gridRowStart, rowStartPosition); } 1322 void setGridRowStart(const GridPosition& rowStartPosition) { SET_VAR(rareNon InheritedData.access()->m_gridItem, m_gridRowStart, rowStartPosition); }
1320 void setGridRowEnd(const GridPosition& rowEndPosition) { SET_VAR(rareNonInhe ritedData.access()->m_gridItem, m_gridRowEnd, rowEndPosition); } 1323 void setGridRowEnd(const GridPosition& rowEndPosition) { SET_VAR(rareNonInhe ritedData.access()->m_gridItem, m_gridRowEnd, rowEndPosition); }
1324 void setGridColumnGap(const Length& v) { SET_VAR(rareNonInheritedData.access ()->m_grid, m_gridColumnGap, v); }
1325 void setGridRowGap(const Length& v) { SET_VAR(rareNonInheritedData.access()- >m_grid, m_gridRowGap, v); }
1321 1326
1322 void setUserModify(EUserModify u) { SET_VAR(rareInheritedData, userModify, u ); } 1327 void setUserModify(EUserModify u) { SET_VAR(rareInheritedData, userModify, u ); }
1323 void setUserDrag(EUserDrag d) { SET_VAR(rareNonInheritedData, userDrag, d); } 1328 void setUserDrag(EUserDrag d) { SET_VAR(rareNonInheritedData, userDrag, d); }
1324 void setUserSelect(EUserSelect s) { SET_VAR(rareInheritedData, userSelect, s ); } 1329 void setUserSelect(EUserSelect s) { SET_VAR(rareInheritedData, userSelect, s ); }
1325 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData, textOverflow, overflow); } 1330 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData, textOverflow, overflow); }
1326 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa ta, marginBeforeCollapse, c); } 1331 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa ta, marginBeforeCollapse, c); }
1327 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat a, marginAfterCollapse, c); } 1332 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat a, marginAfterCollapse, c); }
1328 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b); } 1333 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b); }
1329 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW rap, b); } 1334 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW rap, b); }
1330 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); } 1335 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); }
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
1725 1730
1726 static NamedGridLinesMap initialNamedGridColumnLines() { return NamedGridLin esMap(); } 1731 static NamedGridLinesMap initialNamedGridColumnLines() { return NamedGridLin esMap(); }
1727 static NamedGridLinesMap initialNamedGridRowLines() { return NamedGridLinesM ap(); } 1732 static NamedGridLinesMap initialNamedGridRowLines() { return NamedGridLinesM ap(); }
1728 1733
1729 static OrderedNamedGridLines initialOrderedNamedGridColumnLines() { return O rderedNamedGridLines(); } 1734 static OrderedNamedGridLines initialOrderedNamedGridColumnLines() { return O rderedNamedGridLines(); }
1730 static OrderedNamedGridLines initialOrderedNamedGridRowLines() { return Orde redNamedGridLines(); } 1735 static OrderedNamedGridLines initialOrderedNamedGridRowLines() { return Orde redNamedGridLines(); }
1731 1736
1732 static NamedGridAreaMap initialNamedGridArea() { return NamedGridAreaMap(); } 1737 static NamedGridAreaMap initialNamedGridArea() { return NamedGridAreaMap(); }
1733 static size_t initialNamedGridAreaCount() { return 0; } 1738 static size_t initialNamedGridAreaCount() { return 0; }
1734 1739
1740 static Length initialGridColumnGap() { return Length(Fixed); }
1741 static Length initialGridRowGap() { return Length(Fixed); }
1742
1735 // 'auto' is the default. 1743 // 'auto' is the default.
1736 static GridPosition initialGridColumnStart() { return GridPosition(); } 1744 static GridPosition initialGridColumnStart() { return GridPosition(); }
1737 static GridPosition initialGridColumnEnd() { return GridPosition(); } 1745 static GridPosition initialGridColumnEnd() { return GridPosition(); }
1738 static GridPosition initialGridRowStart() { return GridPosition(); } 1746 static GridPosition initialGridRowStart() { return GridPosition(); }
1739 static GridPosition initialGridRowEnd() { return GridPosition(); } 1747 static GridPosition initialGridRowEnd() { return GridPosition(); }
1740 1748
1741 static TabSize initialTabSize() { return TabSize(8); } 1749 static TabSize initialTabSize() { return TabSize(8); }
1742 1750
1743 static WrapFlow initialWrapFlow() { return WrapFlowAuto; } 1751 static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
1744 static WrapThrough initialWrapThrough() { return WrapThroughWrap; } 1752 static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
1946 } 1954 }
1947 1955
1948 inline bool ComputedStyle::hasPseudoElementStyle() const 1956 inline bool ComputedStyle::hasPseudoElementStyle() const
1949 { 1957 {
1950 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1958 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1951 } 1959 }
1952 1960
1953 } // namespace blink 1961 } // namespace blink
1954 1962
1955 #endif // ComputedStyle_h 1963 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698