Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(915)

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

Issue 14786002: Allow defining named grid lines on the grid element (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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
Download patch
Index: Source/core/rendering/style/StyleGridData.h
diff --git a/Source/core/rendering/style/StyleGridData.h b/Source/core/rendering/style/StyleGridData.h
index d2382b959239f4f58f6f7b7be6ac0cf3e5a9c0d8..95e78a3cf82ecf4ef7202f2b1fd405f7eace4bd9 100644
--- a/Source/core/rendering/style/StyleGridData.h
+++ b/Source/core/rendering/style/StyleGridData.h
@@ -31,9 +31,12 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
namespace WebCore {
+typedef HashMap<String, Vector<size_t> > NamedGridLinesMapping;
+
esprehn 2013/05/03 21:45:58 NamedGridLinesMap to be consistent with other usag
Julien - ping for review 2013/05/06 16:22:33 Will be changed.
class StyleGridData : public RefCounted<StyleGridData> {
public:
static PassRefPtr<StyleGridData> create() { return adoptRef(new StyleGridData); }
@@ -41,7 +44,7 @@ public:
bool operator==(const StyleGridData& o) const
{
- return m_gridColumns == o.m_gridColumns && m_gridRows == o.m_gridRows && m_gridAutoFlow == o.m_gridAutoFlow && m_gridAutoRows == o.m_gridAutoRows && m_gridAutoColumns == o.m_gridAutoColumns;
+ return m_gridColumns == o.m_gridColumns && m_gridRows == o.m_gridRows && 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;
}
bool operator!=(const StyleGridData& o) const
@@ -53,6 +56,9 @@ public:
Vector<GridTrackSize> m_gridColumns;
Vector<GridTrackSize> m_gridRows;
+ NamedGridLinesMapping m_namedGridColumnLines;
+ NamedGridLinesMapping m_namedGridRowLines;
+
GridAutoFlow m_gridAutoFlow;
GridTrackSize m_gridAutoRows;

Powered by Google App Engine
This is Rietveld 408576698