From a4e969f4965059196ca948db781e52f7cfebf19e Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 24 May 2016 08:28:08 +0000 Subject: webkitgtk-2.12.3 --- Source/WebCore/rendering/style/StyleGridData.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'Source/WebCore/rendering/style/StyleGridData.cpp') diff --git a/Source/WebCore/rendering/style/StyleGridData.cpp b/Source/WebCore/rendering/style/StyleGridData.cpp index 10eccc0d8..fa22ed2c3 100644 --- a/Source/WebCore/rendering/style/StyleGridData.cpp +++ b/Source/WebCore/rendering/style/StyleGridData.cpp @@ -26,6 +26,8 @@ #include "config.h" #include "StyleGridData.h" +#if ENABLE(CSS_GRID_LAYOUT) + #include "RenderStyle.h" namespace WebCore { @@ -35,12 +37,16 @@ StyleGridData::StyleGridData() , m_gridRows(RenderStyle::initialGridRows()) , m_namedGridColumnLines(RenderStyle::initialNamedGridColumnLines()) , m_namedGridRowLines(RenderStyle::initialNamedGridRowLines()) + , m_orderedNamedGridColumnLines(RenderStyle::initialOrderedNamedGridColumnLines()) + , m_orderedNamedGridRowLines(RenderStyle::initialOrderedNamedGridRowLines()) , m_gridAutoFlow(RenderStyle::initialGridAutoFlow()) , m_gridAutoRows(RenderStyle::initialGridAutoRows()) , m_gridAutoColumns(RenderStyle::initialGridAutoColumns()) , m_namedGridArea(RenderStyle::initialNamedGridArea()) , m_namedGridAreaRowCount(RenderStyle::initialNamedGridAreaCount()) , m_namedGridAreaColumnCount(RenderStyle::initialNamedGridAreaCount()) + , m_gridColumnGap(RenderStyle::initialGridColumnGap()) + , m_gridRowGap(RenderStyle::initialGridRowGap()) { } @@ -50,19 +56,24 @@ inline StyleGridData::StyleGridData(const StyleGridData& o) , m_gridRows(o.m_gridRows) , m_namedGridColumnLines(o.m_namedGridColumnLines) , m_namedGridRowLines(o.m_namedGridRowLines) + , m_orderedNamedGridColumnLines(o.m_orderedNamedGridColumnLines) + , m_orderedNamedGridRowLines(o.m_orderedNamedGridRowLines) , m_gridAutoFlow(o.m_gridAutoFlow) , m_gridAutoRows(o.m_gridAutoRows) , m_gridAutoColumns(o.m_gridAutoColumns) , m_namedGridArea(o.m_namedGridArea) , m_namedGridAreaRowCount(o.m_namedGridAreaRowCount) , m_namedGridAreaColumnCount(o.m_namedGridAreaColumnCount) + , m_gridColumnGap(o.m_gridColumnGap) + , m_gridRowGap(o.m_gridRowGap) { } -PassRef StyleGridData::copy() const +Ref StyleGridData::copy() const { return adoptRef(*new StyleGridData(*this)); } } // namespace WebCore +#endif /* ENABLE(CSS_GRID_LAYOUT) */ -- cgit v1.2.1