[Alignment] Single class for holding the alignment data.

Source/core/style/StyleRareNonInheritedData.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 19 matching lines @@
 #include "core/layout/ClipPathOperation.h"
 #include "core/style/BasicShapes.h"
 #include "core/style/CounterDirectives.h"
 #include "core/style/CursorData.h"
 #include "core/style/DataRef.h"
 #include "core/style/FillLayer.h"
 #include "core/style/ComputedStyleConstants.h"
 #include "core/style/LineClampValue.h"
 #include "core/style/NinePieceImage.h"
 #include "core/style/ShapeValue.h"
+#include "core/style/StyleContentAlignmentData.h"
+#include "core/style/StyleSelfAlignmentData.h"
 #include "platform/LengthPoint.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class ContentData;
 class CSSAnimationData;
 class CSSTransitionData;
@@ skipping 88 matching lines @@
     StyleColor m_visitedLinkTextDecorationColor;
     StyleColor m_visitedLinkBackgroundColor;
     StyleColor m_visitedLinkOutlineColor;
     StyleColor m_visitedLinkBorderLeftColor;
     StyleColor m_visitedLinkBorderRightColor;
     StyleColor m_visitedLinkBorderTopColor;
     StyleColor m_visitedLinkBorderBottomColor;
 
     Vector<String> m_callbackSelectors;
 
+    StyleContentAlignmentData m_alignContent;
+    StyleSelfAlignmentData m_alignItems;
+    StyleSelfAlignmentData m_alignSelf;
+    StyleContentAlignmentData m_justifyContent;
+    StyleSelfAlignmentData m_justifyItems;
+    StyleSelfAlignmentData m_justifySelf;
+
     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
     unsigned marginAfterCollapse : 2; // EMarginCollapse
     unsigned m_appearance : 6; // EAppearance
     unsigned m_textCombine : 1; // CSS3 text-combine properties
 
     unsigned m_textDecorationStyle : 3; // TextDecorationStyle
     unsigned m_wrapFlow: 3; // WrapFlow
     unsigned m_wrapThrough: 1; // WrapThrough
 
     unsigned m_hasCurrentOpacityAnimation : 1;
     unsigned m_hasCurrentTransformAnimation : 1;
     unsigned m_hasCurrentFilterAnimation : 1;
     unsigned m_runningOpacityAnimationOnCompositor : 1;
     unsigned m_runningTransformAnimationOnCompositor : 1;
     unsigned m_runningFilterAnimationOnCompositor : 1;
 
     unsigned m_effectiveBlendMode: 5; // EBlendMode
 
     unsigned m_touchAction : TouchActionBits; // TouchAction
 
     unsigned m_objectFit : 3; // ObjectFit
 
     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;
 
     unsigned m_scrollBlocksOn: 3; // WebScrollBlocksOn
 
     // Plugins require accelerated compositing for reasons external to blink.
     // In which case, we need to update the ComputedStyle on the LayoutEmbeddedObject,
     // so store this bit so that the style actually changes when the plugin
     // becomes composited.
     unsigned m_requiresAcceleratedCompositingForExternalReasons: 1;
 
     // Whether the transform (if it exists) is stored in the element's inline style.
     unsigned m_hasInlineTransform : 1;
     unsigned m_resize : 2; // EResize
     unsigned m_hasCompositorProxy : 1;
 
 private:
     StyleRareNonInheritedData();
     StyleRareNonInheritedData(const StyleRareNonInheritedData&);
 };
 
 } // namespace blink
 
 #endif // StyleRareNonInheritedData_h