[Alignment] Single class for holding the alignment data.

Source/core/css/resolver/StyleAdjuster.cpp

Index: Source/core/css/resolver/StyleAdjuster.cpp
diff --git a/Source/core/css/resolver/StyleAdjuster.cpp b/Source/core/css/resolver/StyleAdjuster.cpp
index 19c3d4d940e1ea95ac68fb61ccf522425472266e..cd65905f09b70d2afd4f35ec373b872b6137f38e 100644
--- a/Source/core/css/resolver/StyleAdjuster.cpp
+++ b/Source/core/css/resolver/StyleAdjuster.cpp
@@ -268,31 +268,27 @@ void StyleAdjuster::adjustStyleForAlignment(ComputedStyle& style, const Computed
     // Otherwise, auto computes to:
     //  - 'stretch' for flex containers and grid containers.
     //  - 'start' for everything else.
-    if (style.justifyItems() == ItemPositionAuto) {
-        if (parentStyle.justifyItemsPositionType() == LegacyPosition) {
+    if (style.justifyItemsPosition() == ItemPositionAuto) {
+        if (parentStyle.justifyItemsPositionType() == LegacyPosition)
             style.setJustifyItems(parentStyle.justifyItems());
-            style.setJustifyItemsPositionType(parentStyle.justifyItemsPositionType());
-        } else if (isFlexOrGrid) {
+        else if (isFlexOrGrid)
             style.setJustifyItems(ItemPositionStretch);
-        }
     }
 
     // The 'auto' keyword computes to 'stretch' on absolutely-positioned elements,
     // and to the computed value of justify-items on the parent (minus
     // any legacy keywords) on all other boxes.
-    if (style.justifySelf() == ItemPositionAuto) {
-        if (absolutePositioned) {
+    if (style.justifySelfPosition() == ItemPositionAuto) {
+        if (absolutePositioned)
             style.setJustifySelf(ItemPositionStretch);
-        } else {
+        else
             style.setJustifySelf(parentStyle.justifyItems());
-            style.setJustifySelfOverflowAlignment(parentStyle.justifyItemsOverflowAlignment());
-        }
     }
 
     // The 'auto' keyword computes to:
     //  - 'stretch' for flex containers and grid containers,
     //  - 'start' for everything else.
-    if (style.alignItems() == ItemPositionAuto) {
+    if (style.alignItemsPosition() == ItemPositionAuto) {
         if (isFlexOrGrid)
             style.setAlignItems(ItemPositionStretch);
     }
@@ -300,20 +296,18 @@ void StyleAdjuster::adjustStyleForAlignment(ComputedStyle& style, const Computed
     // The 'auto' keyword computes to 'stretch' on absolutely-positioned elements,
     // and to the computed value of align-items on the parent (minus
     // any 'legacy' keywords) on all other boxes.
-    if (style.alignSelf() == ItemPositionAuto) {
-        if (absolutePositioned) {
+    if (style.alignSelfPosition() == ItemPositionAuto) {
+        if (absolutePositioned)
             style.setAlignSelf(ItemPositionStretch);
-        } else {
+        else
             style.setAlignSelf(parentStyle.alignItems());
-            style.setAlignSelfOverflowAlignment(parentStyle.alignItemsOverflowAlignment());
-        }
     }
 
     // Block Containers: For table cells, the behavior of the 'auto' depends on the computed
     // value of 'vertical-align', otherwise behaves as 'start'.
     // Flex Containers: 'auto' computes to 'flex-start'.
     // Grid Containers: 'auto' computes to 'start', and 'stretch' behaves like 'start'.
-    if ((style.justifyContent() == ContentPositionAuto) && (style.justifyContentDistribution() == ContentDistributionDefault)) {
+    if ((style.justifyContentPosition() == ContentPositionAuto) && (style.justifyContentDistribution() == ContentDistributionDefault)) {
         if (style.isDisplayFlexibleOrGridBox()) {
             if (style.isDisplayFlexibleBox())
                 style.setJustifyContent(ContentPositionFlexStart);
@@ -326,10 +320,10 @@ void StyleAdjuster::adjustStyleForAlignment(ComputedStyle& style, const Computed
     // value of 'vertical-align', otherwise behaves as 'start'.
     // Flex Containers: 'auto' computes to 'stretch'.
     // Grid Containers: 'auto' computes to 'start', and 'stretch' behaves like 'start'.
-    if (style.alignContent() == ContentPositionAuto && style.alignContentDistribution() == ContentDistributionDefault) {
+    if (style.alignContentPosition() == ContentPositionAuto && style.alignContentDistribution() == ContentDistributionDefault) {
         if (style.isDisplayFlexibleOrGridBox()) {
             if (style.isDisplayFlexibleBox())
-                style.setAlignContentDistribution(ContentDistributionStretch);
+                style.setAlignContent(ContentDistributionStretch);
             else
                 style.setAlignContent(ContentPositionStart);
         }