Index: Source/core/rendering/style/StyleGridData.h |
diff --git a/Source/core/rendering/style/StyleGridData.h b/Source/core/rendering/style/StyleGridData.h |
index 3b602ad569ae5a18b13229c8111c5eceee499383..244a4de9ccf6f9c8c04ab171afe4400b3ab033c9 100644 |
--- a/Source/core/rendering/style/StyleGridData.h |
+++ b/Source/core/rendering/style/StyleGridData.h |
@@ -26,6 +26,7 @@ |
#ifndef StyleGridData_h |
#define StyleGridData_h |
+#include "core/rendering/style/GridCoordinate.h" |
#include "core/rendering/style/GridTrackSize.h" |
#include "core/rendering/style/RenderStyleConstants.h" |
#include <wtf/PassRefPtr.h> |
@@ -44,7 +45,7 @@ public: |
bool operator==(const StyleGridData& o) const |
{ |
- return m_gridDefinitionColumns == o.m_gridDefinitionColumns && m_gridDefinitionRows == o.m_gridDefinitionRows && 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; |
+ return m_gridDefinitionColumns == o.m_gridDefinitionColumns && m_gridDefinitionRows == o.m_gridDefinitionRows && 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_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 |
@@ -63,6 +64,13 @@ public: |
GridTrackSize m_gridAutoRows; |
GridTrackSize m_gridAutoColumns; |
+ // This HashMap stored the named grid areas. |
ojan
2013/07/29 23:03:28
I don't think this comment adds value.
Julien - ping for review
2013/07/30 18:43:33
Fair enough, removed.
|
+ NamedGridAreaMap m_namedGridArea; |
+ // Because m_namedGridArea doesn't store the unnamed grid areas, we need to keep track |
+ // of the explicit grid size defined by both named and unnamed grid areas. |
+ size_t m_namedGridAreaRowCount; |
+ size_t m_namedGridAreaColumnCount; |
+ |
private: |
StyleGridData(); |
StyleGridData(const StyleGridData&); |