Source/core/rendering/style/RenderStyle.h - Issue 18532004: Implement 'grid-template' parsing

Unified Diff: Source/core/rendering/style/RenderStyle.h

Issue 18532004: Implement 'grid-template' parsing (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Same change, forgot to update css-properties-as-js-properties.html result Created 7 years, 5 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 side-by-side diff with in-line comments

« Source/core/css/resolver/StyleResolver.cpp ('K') | « Source/core/rendering/style/GridCoordinate.h ('k') | Source/core/rendering/style/StyleGridData.h » ('j') | Source/core/rendering/style/StyleGridData.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/style/RenderStyle.h

diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h

index ed50dfc8102b9b43840cbab120917c79b5503f58..7f004ce9e73f153b5d1e848f2a00acc29b290fe5 100644

--- a/Source/core/rendering/style/RenderStyle.h

+++ b/Source/core/rendering/style/RenderStyle.h

@@ -743,6 +743,9 @@ public:

const Vector<GridTrackSize>& gridDefinitionRows() const { return rareNonInheritedData->m_grid->m_gridDefinitionRows; }

const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheritedData->m_grid->m_namedGridColumnLines; }

const NamedGridLinesMap& namedGridRowLines() const { return rareNonInheritedData->m_grid->m_namedGridRowLines; }

+ 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 rareNonInheritedData->m_grid->m_gridAutoFlow; }

const GridTrackSize& gridAutoColumns() const { return rareNonInheritedData->m_grid->m_gridAutoColumns; }

const GridTrackSize& gridAutoRows() const { return rareNonInheritedData->m_grid->m_gridAutoRows; }

@@ -1194,6 +1197,9 @@ public:

void setGridDefinitionRows(const Vector<GridTrackSize>& lengths) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridDefinitionRows, 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 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); }

@@ -1606,6 +1612,9 @@ public:

static NamedGridLinesMap initialNamedGridColumnLines() { return NamedGridLinesMap(); }

static NamedGridLinesMap initialNamedGridRowLines() { return NamedGridLinesMap(); }

+ 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(); }