[Alignment] Single class for holding the alignment data.

Source/core/style/StyleRareNonInheritedData.h

Index: Source/core/style/StyleRareNonInheritedData.h
diff --git a/Source/core/style/StyleRareNonInheritedData.h b/Source/core/style/StyleRareNonInheritedData.h
index 3ec7a162804b23325a0c85a3926049197dc59d8c..2acad156a510b40a0d6a91919a164b73349b1cf7 100644
--- a/Source/core/style/StyleRareNonInheritedData.h
+++ b/Source/core/style/StyleRareNonInheritedData.h
@@ -36,6 +36,7 @@
 #include "core/style/LineClampValue.h"
 #include "core/style/NinePieceImage.h"
 #include "core/style/ShapeValue.h"
+#include "core/style/StyleAlignmentData.h"
 #include "platform/LengthPoint.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassRefPtr.h"
@@ -146,21 +147,17 @@ public:
 
     Vector<String> m_callbackSelectors;
 
+    StyleAlignmentData m_alignContent;
+    StyleAlignmentData m_alignItems;
+    StyleAlignmentData m_alignSelf;
+    StyleAlignmentData m_justifyContent;
+    StyleAlignmentData m_justifyItems;
+    StyleAlignmentData m_justifySelf;

[esprehn, 2015/04/14 00:48:55]

This is making this object a bunch bigger since the fields don't pack anymore.
Can you measure the difference?

[jfernandez, 2015/04/14 22:56:21]

As we commented in the IRC, I'll try yo land a patch with a compile time
assertion to check out the size increment.

+
     unsigned m_pageSizeType : 2; // PageSizeType
     unsigned m_transformStyle3D : 1; // ETransformStyle3D
     unsigned m_backfaceVisibility : 1; // EBackfaceVisibility
 
-    unsigned m_alignContent : 4; // ContentPosition
-    unsigned m_alignContentDistribution : 3; // ContentDistributionType
-    unsigned m_alignContentOverflowAlignment : 2; // OverflowAlignment
-    unsigned m_alignItems : 4; // ItemPosition
-    unsigned m_alignItemsOverflowAlignment : 2; // OverflowAlignment
-    unsigned m_alignSelf : 4; // ItemPosition
-    unsigned m_alignSelfOverflowAlignment : 2; // OverflowAlignment
-    unsigned m_justifyContent : 4; // ContentPosition
-    unsigned m_justifyContentDistribution : 3; // ContentDistributionType
-    unsigned m_justifyContentOverflowAlignment : 2; // OverflowAlignment
-
     unsigned userDrag : 2; // EUserDrag
     unsigned textOverflow : 1; // Whether or not lines that spill out should be truncated with "..."
     unsigned marginBeforeCollapse : 2; // EMarginCollapse
@@ -187,13 +184,6 @@ public:
 
     unsigned m_isolation : 1; // Isolation
 
-    unsigned m_justifyItems : 4; // ItemPosition
-    unsigned m_justifyItemsOverflowAlignment : 2; // OverflowAlignment
-    unsigned m_justifyItemsPositionType: 1; // Whether or not alignment uses the 'legacy' keyword.
-
-    unsigned m_justifySelf : 4; // ItemPosition
-    unsigned m_justifySelfOverflowAlignment : 2; // OverflowAlignment
-
     // ScrollBehavior. 'scroll-behavior' has 2 accepted values, but ScrollBehavior has a third
     // value (that can only be specified using CSSOM scroll APIs) so 2 bits are needed.
     unsigned m_scrollBehavior: 2;