[Alignment] Single class for holding the alignment data.

Source/core/style/StyleRareNonInheritedData.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * 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
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 36 matching lines @@
 
     FillLayer fillLayers;
     NinePieceImage ninePieces;
     LengthSize lengthSizes;
     Length lengths;
 
     StyleColor styleColors[8];
 
     Vector<String> m_callbackSelectors;
 
-    unsigned m_bitFields[4];
+    StyleContentAlignmentData contentAlignmentData[2];
+    StyleSelfAlignmentData selfAlignmentData[4];
+
+    unsigned m_bitFields[2];
 };
 
 static_assert(sizeof(StyleRareNonInheritedData) == sizeof(SameSizeStyleRareNonInheritedData), "StyleRareNonInheritedData_should_stay_small");
 
 StyleRareNonInheritedData::StyleRareNonInheritedData()
     : opacity(ComputedStyle::initialOpacity())
     , m_perspective(ComputedStyle::initialPerspective())
     , m_shapeImageThreshold(ComputedStyle::initialShapeImageThreshold())
     , m_order(ComputedStyle::initialOrder())
     , m_perspectiveOrigin(ComputedStyle::initialPerspectiveOrigin())
     , m_objectPosition(ComputedStyle::initialObjectPosition())
     , lineClamp(ComputedStyle::initialLineClamp())
     , m_draggableRegionMode(DraggableRegionNone)
     , m_shapeOutside(ComputedStyle::initialShapeOutside())
     , m_clipPath(ComputedStyle::initialClipPath())
     , m_mask(MaskFillLayer, true)
     , m_pageSize()
     , m_shapeMargin(ComputedStyle::initialShapeMargin())
     , m_textDecorationColor(StyleColor::currentColor())
     , m_visitedLinkTextDecorationColor(StyleColor::currentColor())
     , m_visitedLinkBackgroundColor(ComputedStyle::initialBackgroundColor())
     , m_visitedLinkOutlineColor(StyleColor::currentColor())
     , m_visitedLinkBorderLeftColor(StyleColor::currentColor())
     , m_visitedLinkBorderRightColor(StyleColor::currentColor())
     , m_visitedLinkBorderTopColor(StyleColor::currentColor())
     , m_visitedLinkBorderBottomColor(StyleColor::currentColor())
+    , m_alignContent(ComputedStyle::initialContentAlignment())
+    , m_alignItems(ComputedStyle::initialSelfAlignment())
+    , m_alignSelf(ComputedStyle::initialSelfAlignment())
+    , m_justifyContent(ComputedStyle::initialContentAlignment())
+    , m_justifyItems(ComputedStyle::initialSelfAlignment())
+    , m_justifySelf(ComputedStyle::initialSelfAlignment())
     , m_pageSizeType(PAGE_SIZE_AUTO)
     , m_transformStyle3D(ComputedStyle::initialTransformStyle3D())
     , m_backfaceVisibility(ComputedStyle::initialBackfaceVisibility())
-    , m_alignContent(ComputedStyle::initialAlignContent())
-    , m_alignContentDistribution(ComputedStyle::initialAlignContentDistribution())
-    , m_alignContentOverflowAlignment(ComputedStyle::initialAlignContentOverflowAlignment())
-    , m_alignItems(ComputedStyle::initialAlignItems())
-    , m_alignItemsOverflowAlignment(ComputedStyle::initialAlignItemsOverflowAlignment())
-    , m_alignSelf(ComputedStyle::initialAlignSelf())
-    , m_alignSelfOverflowAlignment(ComputedStyle::initialAlignSelfOverflowAlignment())
-    , m_justifyContent(ComputedStyle::initialJustifyContent())
-    , m_justifyContentDistribution(ComputedStyle::initialJustifyContentDistribution())
-    , m_justifyContentOverflowAlignment(ComputedStyle::initialJustifyContentOverflowAlignment())
     , userDrag(ComputedStyle::initialUserDrag())
     , textOverflow(ComputedStyle::initialTextOverflow())
     , marginBeforeCollapse(MCOLLAPSE)
     , marginAfterCollapse(MCOLLAPSE)
     , m_appearance(ComputedStyle::initialAppearance())
     , m_textCombine(ComputedStyle::initialTextCombine())
     , m_textDecorationStyle(ComputedStyle::initialTextDecorationStyle())
     , m_wrapFlow(ComputedStyle::initialWrapFlow())
     , m_wrapThrough(ComputedStyle::initialWrapThrough())
     , m_hasCurrentOpacityAnimation(false)
     , m_hasCurrentTransformAnimation(false)
     , m_hasCurrentFilterAnimation(false)
     , m_runningOpacityAnimationOnCompositor(false)
     , m_runningTransformAnimationOnCompositor(false)
     , m_runningFilterAnimationOnCompositor(false)
     , m_effectiveBlendMode(ComputedStyle::initialBlendMode())
     , m_touchAction(ComputedStyle::initialTouchAction())
     , m_objectFit(ComputedStyle::initialObjectFit())
     , m_isolation(ComputedStyle::initialIsolation())
-    , m_justifyItems(ComputedStyle::initialJustifyItems())
-    , m_justifyItemsOverflowAlignment(ComputedStyle::initialJustifyItemsOverflowAlignment())
-    , m_justifyItemsPositionType(ComputedStyle::initialJustifyItemsPositionType())
-    , m_justifySelf(ComputedStyle::initialJustifySelf())
-    , m_justifySelfOverflowAlignment(ComputedStyle::initialJustifySelfOverflowAlignment())
     , m_scrollBehavior(ComputedStyle::initialScrollBehavior())
     , m_scrollBlocksOn(ComputedStyle::initialScrollBlocksOn())
     , m_requiresAcceleratedCompositingForExternalReasons(false)
     , m_hasInlineTransform(false)
     , m_resize(ComputedStyle::initialResize())
     , m_hasCompositorProxy(false)
 {
     m_maskBoxImage.setMaskDefaults();
 }
 
@@ skipping 28 matching lines @@
     , m_pageSize(o.m_pageSize)
     , m_shapeMargin(o.m_shapeMargin)
     , m_textDecorationColor(o.m_textDecorationColor)
     , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor)
     , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor)
     , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor)
     , m_visitedLinkBorderLeftColor(o.m_visitedLinkBorderLeftColor)
     , m_visitedLinkBorderRightColor(o.m_visitedLinkBorderRightColor)
     , m_visitedLinkBorderTopColor(o.m_visitedLinkBorderTopColor)
     , m_visitedLinkBorderBottomColor(o.m_visitedLinkBorderBottomColor)
+    , m_alignContent(o.m_alignContent)
+    , m_alignItems(o.m_alignItems)
+    , m_alignSelf(o.m_alignSelf)
+    , m_justifyContent(o.m_justifyContent)
+    , m_justifyItems(o.m_justifyItems)
+    , m_justifySelf(o.m_justifySelf)
     , m_pageSizeType(o.m_pageSizeType)
     , m_transformStyle3D(o.m_transformStyle3D)
     , m_backfaceVisibility(o.m_backfaceVisibility)
-    , m_alignContent(o.m_alignContent)
-    , m_alignContentDistribution(o.m_alignContentDistribution)
-    , m_alignContentOverflowAlignment(o.m_alignContentOverflowAlignment)
-    , m_alignItems(o.m_alignItems)
-    , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment)
-    , m_alignSelf(o.m_alignSelf)
-    , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment)
-    , m_justifyContent(o.m_justifyContent)
-    , m_justifyContentDistribution(o.m_justifyContentDistribution)
-    , m_justifyContentOverflowAlignment(o.m_justifyContentOverflowAlignment)
     , userDrag(o.userDrag)
     , textOverflow(o.textOverflow)
     , marginBeforeCollapse(o.marginBeforeCollapse)
     , marginAfterCollapse(o.marginAfterCollapse)
     , m_appearance(o.m_appearance)
     , m_textCombine(o.m_textCombine)
     , m_textDecorationStyle(o.m_textDecorationStyle)
     , m_wrapFlow(o.m_wrapFlow)
     , m_wrapThrough(o.m_wrapThrough)
     , m_hasCurrentOpacityAnimation(o.m_hasCurrentOpacityAnimation)
     , m_hasCurrentTransformAnimation(o.m_hasCurrentTransformAnimation)
     , m_hasCurrentFilterAnimation(o.m_hasCurrentFilterAnimation)
     , m_runningOpacityAnimationOnCompositor(o.m_runningOpacityAnimationOnCompositor)
     , m_runningTransformAnimationOnCompositor(o.m_runningTransformAnimationOnCompositor)
     , m_runningFilterAnimationOnCompositor(o.m_runningFilterAnimationOnCompositor)
     , m_effectiveBlendMode(o.m_effectiveBlendMode)
     , m_touchAction(o.m_touchAction)
     , m_objectFit(o.m_objectFit)
     , m_isolation(o.m_isolation)
-    , m_justifyItems(o.m_justifyItems)
-    , m_justifyItemsOverflowAlignment(o.m_justifyItemsOverflowAlignment)
-    , m_justifyItemsPositionType(o.m_justifyItemsPositionType)
-    , m_justifySelf(o.m_justifySelf)
-    , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment)
     , m_scrollBehavior(o.m_scrollBehavior)
     , m_scrollBlocksOn(o.m_scrollBlocksOn)
     , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAcceleratedCompositingForExternalReasons)
     , m_hasInlineTransform(o.m_hasInlineTransform)
     , m_resize(o.m_resize)
     , m_hasCompositorProxy(o.m_hasCompositorProxy)
 {
 }
 
 StyleRareNonInheritedData::~StyleRareNonInheritedData()
@@ skipping 35 matching lines @@
         && clipPathDataEquivalent(o)
         && m_textDecorationColor == o.m_textDecorationColor
         && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColor
         && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor
         && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor
         && m_visitedLinkBorderLeftColor == o.m_visitedLinkBorderLeftColor
         && m_visitedLinkBorderRightColor == o.m_visitedLinkBorderRightColor
         && m_visitedLinkBorderTopColor == o.m_visitedLinkBorderTopColor
         && m_visitedLinkBorderBottomColor == o.m_visitedLinkBorderBottomColor
         && m_callbackSelectors == o.m_callbackSelectors
+        && m_alignContent == o.m_alignContent
+        && m_alignItems == o.m_alignItems
+        && m_alignSelf == o.m_alignSelf
+        && m_justifyContent == o.m_justifyContent
+        && m_justifyItems == o.m_justifyItems
+        && m_justifySelf == o.m_justifySelf
         && m_pageSizeType == o.m_pageSizeType
         && m_transformStyle3D == o.m_transformStyle3D
         && m_backfaceVisibility == o.m_backfaceVisibility
-        && m_alignContent == o.m_alignContent
-        && m_alignContentDistribution == o.m_alignContentDistribution
-        && m_alignContentOverflowAlignment == o.m_alignContentOverflowAlignment
-        && m_alignItems == o.m_alignItems
-        && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment
-        && m_alignSelf == o.m_alignSelf
-        && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment
-        && m_justifyContent == o.m_justifyContent
-        && m_justifyContentDistribution == o.m_justifyContentDistribution
-        && m_justifyContentOverflowAlignment == o.m_justifyContentOverflowAlignment
         && userDrag == o.userDrag
         && textOverflow == o.textOverflow
         && marginBeforeCollapse == o.marginBeforeCollapse
         && marginAfterCollapse == o.marginAfterCollapse
         && m_appearance == o.m_appearance
         && m_textCombine == o.m_textCombine
         && m_textDecorationStyle == o.m_textDecorationStyle
         && m_wrapFlow == o.m_wrapFlow
         && m_wrapThrough == o.m_wrapThrough
         && m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation
         && m_hasCurrentTransformAnimation == o.m_hasCurrentTransformAnimation
         && m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation
         && m_effectiveBlendMode == o.m_effectiveBlendMode
         && m_touchAction == o.m_touchAction
         && m_objectFit == o.m_objectFit
         && m_isolation == o.m_isolation
-        && m_justifyItems == o.m_justifyItems
-        && m_justifyItemsOverflowAlignment == o.m_justifyItemsOverflowAlignment
-        && m_justifyItemsPositionType == o.m_justifyItemsPositionType
-        && m_justifySelf == o.m_justifySelf
-        && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment
         && m_scrollBehavior == o.m_scrollBehavior
         && m_scrollBlocksOn == o.m_scrollBlocksOn
         && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcceleratedCompositingForExternalReasons
         && m_hasInlineTransform == o.m_hasInlineTransform
         && m_resize == o.m_resize
         && m_hasCompositorProxy == o.m_hasCompositorProxy;
 }
 
 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInheritedData& o) const
 {
@@ skipping 50 matching lines @@
 {
     return dataEquivalent(m_shapeOutside, o.m_shapeOutside);
 }
 
 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInheritedData& o) const
 {
     return dataEquivalent(m_clipPath, o.m_clipPath);
 }
 
 } // namespace blink