| Index: Source/core/rendering/style/StyleGridData.h
|
| diff --git a/Source/core/rendering/style/StyleGridData.h b/Source/core/rendering/style/StyleGridData.h
|
| index da14eaa29898aac504a2f22444d42e186dfa6c08..6159f9b487afd7636d1a6848b698853a46570f16 100644
|
| --- a/Source/core/rendering/style/StyleGridData.h
|
| +++ b/Source/core/rendering/style/StyleGridData.h
|
| @@ -36,7 +36,6 @@
|
|
|
| namespace WebCore {
|
|
|
| -typedef HashMap<String, Vector<size_t> > NamedGridLinesMap;
|
| typedef HashMap<size_t, Vector<String>, WTF::IntHash<size_t>, WTF::UnsignedWithZeroKeyHashTraits<size_t> > OrderedNamedGridLines;
|
|
|
| class StyleGridData : public RefCounted<StyleGridData> {
|
| @@ -46,7 +45,7 @@ public:
|
|
|
| bool operator==(const StyleGridData& o) const
|
| {
|
| - return m_gridTemplateColumns == o.m_gridTemplateColumns && m_gridTemplateRows == o.m_gridTemplateRows && m_gridAutoFlow == o.m_gridAutoFlow && m_gridAutoRows == o.m_gridAutoRows && m_gridAutoColumns == o.m_gridAutoColumns && m_namedGridColumnLines == o.m_namedGridColumnLines && m_namedGridRowLines == o.m_namedGridRowLines && m_orderedNamedGridColumnLines == o.m_orderedNamedGridColumnLines && m_orderedNamedGridRowLines == o.m_orderedNamedGridRowLines && m_namedGridArea == o.m_namedGridArea && m_namedGridArea == o.m_namedGridArea && m_namedGridAreaRowCount == o.m_namedGridAreaRowCount && m_namedGridAreaColumnCount == o.m_namedGridAreaColumnCount;
|
| + return m_gridTemplateColumns == o.m_gridTemplateColumns && m_gridTemplateRows == o.m_gridTemplateRows && m_gridAutoFlow == o.m_gridAutoFlow && m_gridAutoRows == o.m_gridAutoRows && m_gridAutoColumns == o.m_gridAutoColumns && m_orderedNamedGridColumnLines == o.m_orderedNamedGridColumnLines && m_orderedNamedGridRowLines == o.m_orderedNamedGridRowLines && m_namedGridArea == o.m_namedGridArea && m_namedGridArea == o.m_namedGridArea && m_namedGridAreaRowCount == o.m_namedGridAreaRowCount && m_namedGridAreaColumnCount == o.m_namedGridAreaColumnCount;
|
| }
|
|
|
| bool operator!=(const StyleGridData& o) const
|
| @@ -57,9 +56,6 @@ public:
|
| Vector<GridTrackSize> m_gridTemplateColumns;
|
| Vector<GridTrackSize> m_gridTemplateRows;
|
|
|
| - NamedGridLinesMap m_namedGridColumnLines;
|
| - NamedGridLinesMap m_namedGridRowLines;
|
| -
|
| // In order to reconstruct the original named grid line order, we can't rely on NamedGridLinesMap
|
| // as it loses the position if multiple grid lines are set on a single track.
|
| OrderedNamedGridLines m_orderedNamedGridColumnLines;
|
|
|