| Index: Source/core/css/resolver/StyleResolver.cpp
|
| diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
|
| index 87e23ed306e135e387b2d810eef1cf2e700852d8..cee724569fa3b396d646bf479f8f2a708248f053 100644
|
| --- a/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -2984,14 +2984,14 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
|
| state.style()->setGridAutoRows(trackSize);
|
| return;
|
| }
|
| - case CSSPropertyGridColumns: {
|
| + case CSSPropertyGridDefinitionColumns: {
|
| if (isInherit) {
|
| - m_state.style()->setGridColumns(m_state.parentStyle()->gridColumns());
|
| + m_state.style()->setGridDefinitionColumns(m_state.parentStyle()->gridDefinitionColumns());
|
| m_state.style()->setNamedGridColumnLines(m_state.parentStyle()->namedGridColumnLines());
|
| return;
|
| }
|
| if (isInitial) {
|
| - m_state.style()->setGridColumns(RenderStyle::initialGridColumns());
|
| + m_state.style()->setGridDefinitionColumns(RenderStyle::initialGridDefinitionColumns());
|
| m_state.style()->setNamedGridColumnLines(RenderStyle::initialNamedGridColumnLines());
|
| return;
|
| }
|
| @@ -3000,18 +3000,18 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
|
| NamedGridLinesMap namedGridLines;
|
| if (!createGridTrackList(value, trackSizes, namedGridLines, state))
|
| return;
|
| - state.style()->setGridColumns(trackSizes);
|
| + state.style()->setGridDefinitionColumns(trackSizes);
|
| state.style()->setNamedGridColumnLines(namedGridLines);
|
| return;
|
| }
|
| - case CSSPropertyGridRows: {
|
| + case CSSPropertyGridDefinitionRows: {
|
| if (isInherit) {
|
| - m_state.style()->setGridRows(m_state.parentStyle()->gridRows());
|
| + m_state.style()->setGridDefinitionRows(m_state.parentStyle()->gridDefinitionRows());
|
| m_state.style()->setNamedGridRowLines(m_state.parentStyle()->namedGridRowLines());
|
| return;
|
| }
|
| if (isInitial) {
|
| - m_state.style()->setGridRows(RenderStyle::initialGridRows());
|
| + m_state.style()->setGridDefinitionRows(RenderStyle::initialGridDefinitionRows());
|
| m_state.style()->setNamedGridRowLines(RenderStyle::initialNamedGridRowLines());
|
| return;
|
| }
|
| @@ -3020,7 +3020,7 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
|
| NamedGridLinesMap namedGridLines;
|
| if (!createGridTrackList(value, trackSizes, namedGridLines, state))
|
| return;
|
| - state.style()->setGridRows(trackSizes);
|
| + state.style()->setGridDefinitionRows(trackSizes);
|
| state.style()->setNamedGridRowLines(namedGridLines);
|
| return;
|
| }
|
|
|