[css-align] Dedicated initial functions for {align-justify}-content

third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 449 matching lines @@
       alignmentData.setOverflow(
           toCSSIdentifierValue(pair.second()).convertTo<OverflowAlignment>());
     }
   } else {
     alignmentData.setPosition(
         toCSSIdentifierValue(value).convertTo<ItemPosition>());
   }
   return alignmentData;
 }
 
-StyleContentAlignmentData StyleBuilderConverter::convertContentAlignmentData(
+StyleContentAlignmentData StyleBuilderConverter::convertAlignContent(
     StyleResolverState&,
     const CSSValue& value) {
   StyleContentAlignmentData alignmentData =
-      ComputedStyle::initialContentAlignment();
+      ComputedStyle::initialAlignContent();
   if (!RuntimeEnabledFeatures::cssGridLayoutEnabled()) {
     const CSSIdentifierValue& identifierValue = toCSSIdentifierValue(value);
     switch (identifierValue.getValueID()) {
+      case CSSValueStretch:
+      case CSSValueSpaceBetween:
+      case CSSValueSpaceAround:
+        alignmentData.setDistribution(
+            identifierValue.convertTo<ContentDistributionType>());
+        break;
+      case CSSValueFlexStart:
+      case CSSValueFlexEnd:
+      case CSSValueCenter:
+        alignmentData.setPosition(identifierValue.convertTo<ContentPosition>());
+        break;
+      default:
+        NOTREACHED();
+    }
+    return alignmentData;
+  }
+  const CSSContentDistributionValue& contentValue =
+      toCSSContentDistributionValue(value);
+  if (contentValue.distribution()->getValueID() != CSSValueInvalid) {
+    alignmentData.setDistribution(
+        contentValue.distribution()->convertTo<ContentDistributionType>());
+  }
+  if (contentValue.position()->getValueID() != CSSValueInvalid) {
+    alignmentData.setPosition(
+        contentValue.position()->convertTo<ContentPosition>());
+  }
+  if (contentValue.overflow()->getValueID() != CSSValueInvalid) {
+    alignmentData.setOverflow(
+        contentValue.overflow()->convertTo<OverflowAlignment>());
+  }
+  return alignmentData;
+}
+
+StyleContentAlignmentData StyleBuilderConverter::convertJustifyContent(
+    StyleResolverState&,
+    const CSSValue& value) {
+  StyleContentAlignmentData alignmentData =
+      ComputedStyle::initialJustifyContent();
+  if (!RuntimeEnabledFeatures::cssGridLayoutEnabled()) {
+    const CSSIdentifierValue& identifierValue = toCSSIdentifierValue(value);
+    switch (identifierValue.getValueID()) {
       case CSSValueStretch:
       case CSSValueSpaceBetween:
       case CSSValueSpaceAround:
         alignmentData.setDistribution(
             identifierValue.convertTo<ContentDistributionType>());
         break;
       case CSSValueFlexStart:
       case CSSValueFlexEnd:
       case CSSValueCenter:
         alignmentData.setPosition(identifierValue.convertTo<ContentPosition>());
         break;
       default:
         ASSERT_NOT_REACHED();
     }
     return alignmentData;
   }
   const CSSContentDistributionValue& contentValue =
       toCSSContentDistributionValue(value);
-  if (contentValue.distribution()->getValueID() != CSSValueInvalid)
+  if (contentValue.distribution()->getValueID() != CSSValueInvalid) {
     alignmentData.setDistribution(
         contentValue.distribution()->convertTo<ContentDistributionType>());
-  if (contentValue.position()->getValueID() != CSSValueInvalid)
+  }
+  if (contentValue.position()->getValueID() != CSSValueInvalid) {
     alignmentData.setPosition(
         contentValue.position()->convertTo<ContentPosition>());
-  if (contentValue.overflow()->getValueID() != CSSValueInvalid)
+  }
+  if (contentValue.overflow()->getValueID() != CSSValueInvalid) {
     alignmentData.setOverflow(
         contentValue.overflow()->convertTo<OverflowAlignment>());
+  }
   return alignmentData;
 }
 
 GridAutoFlow StyleBuilderConverter::convertGridAutoFlow(StyleResolverState&,
                                                         const CSSValue& value) {
   const CSSValueList& list = toCSSValueList(value);
 
   ASSERT(list.length() >= 1);
   const CSSIdentifierValue& first = toCSSIdentifierValue(list.item(0));
   const CSSIdentifierValue* second =
@@ skipping 776 matching lines @@
       // Instead of the actual zoom, use 1 to avoid potential rounding errors
       Length length = primitiveValue.convertToLength(
           state.cssToLengthConversionData().copyWithAdjustedZoom(1));
       return *CSSPrimitiveValue::create(length, 1);
     }
   }
   return value;
 }
 
 }  // namespace blink