[css-align] New CSS Value 'normal' for Content Alignment

third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2011 Sencha, Inc. All rights reserved.
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ skipping 427 matching lines @@
         RefPtrWillBeRawPtr<CSSValueList> afterSlash = CSSValueList::createSpaceSeparated();
         afterSlash->append(valueForFillSize(currLayer->size(), style));
         afterSlash->append(cssValuePool().createValue(currLayer->origin()));
         afterSlash->append(cssValuePool().createValue(currLayer->clip()));
         list->append(afterSlash);
         ret->append(list);
     }
     return ret.release();
 }
 
-static StyleContentAlignmentData resolveJustifyContentAuto(const ComputedStyle& style)
-{
-    const StyleContentAlignmentData& data = style.justifyContent();
-    if (data.position() != ContentPositionAuto || data.distribution() != ContentDistributionDefault)
-        return data;
-
-    if (!RuntimeEnabledFeatures::cssGridLayoutEnabled())
-        return {ContentPositionFlexStart, ContentDistributionDefault, OverflowAlignmentDefault};
-
-    if (style.isDisplayFlexibleBox())
-        return {ContentPositionFlexStart, ContentDistributionDefault, OverflowAlignmentDefault};
-
-    return {ContentPositionStart, ContentDistributionDefault, OverflowAlignmentDefault};
-}
-
-static StyleContentAlignmentData resolveAlignContentAuto(const ComputedStyle& style)
-{
-    const StyleContentAlignmentData& data = style.alignContent();
-    if (data.position() != ContentPositionAuto || data.distribution() != ContentDistributionDefault)
-        return data;
-
-    if (!RuntimeEnabledFeatures::cssGridLayoutEnabled())
-        return {ContentPositionAuto, ContentDistributionStretch, OverflowAlignmentDefault};
-
-    if (style.isDisplayFlexibleBox())
-        return {ContentPositionAuto, ContentDistributionStretch, OverflowAlignmentDefault};
-
-    return {ContentPositionStart, ContentDistributionDefault, OverflowAlignmentDefault};
-}
-
 static PassRefPtrWillBeRawPtr<CSSValueList> valueForContentPositionAndDistributionWithOverflowAlignment(const StyleContentAlignmentData& data)
 {
     RefPtrWillBeRawPtr<CSSValueList> result = CSSValueList::createSpaceSeparated();
     if (data.distribution() != ContentDistributionDefault)
         result->append(CSSPrimitiveValue::create(data.distribution()));
-    if (data.distribution() == ContentDistributionDefault || data.position() != ContentPositionAuto)
+    if (data.distribution() == ContentDistributionDefault || data.position() != ContentPositionNormal)
         result->append(CSSPrimitiveValue::create(data.position()));
     if ((data.position() >= ContentPositionCenter || data.distribution() != ContentDistributionDefault) && data.overflow() != OverflowAlignmentDefault)
         result->append(CSSPrimitiveValue::create(data.overflow()));
     ASSERT(result->length() > 0);
     ASSERT(result->length() <= 3);
     return result.release();
 }
 
 static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForLineHeight(const ComputedStyle& style)
 {
@@ skipping 1102 matching lines @@
         }
         return value.release();
     }
     case CSSPropertyDirection:
         return cssValuePool().createValue(style.direction());
     case CSSPropertyDisplay:
         return cssValuePool().createValue(style.display());
     case CSSPropertyEmptyCells:
         return cssValuePool().createValue(style.emptyCells());
     case CSSPropertyAlignContent:
-        return valueForContentPositionAndDistributionWithOverflowAlignment(resolveAlignContentAuto(style));
+        return valueForContentPositionAndDistributionWithOverflowAlignment(style.alignContent());
     case CSSPropertyAlignItems:
         return valueForItemPositionWithOverflowAlignment(resolveAlignmentAuto(style.alignItemsPosition(), &style), style.alignItemsOverflowAlignment(), NonLegacyPosition);
     case CSSPropertyAlignSelf: {
         ItemPosition position = style.alignSelfPosition();
         if (position == ItemPositionAuto) {
             // TODO(lajava): This code doesn't work for ShadowDOM (see Node::parentComputedStyle)
             const ComputedStyle* parentStyle = styledNode->parentNode() ? styledNode->parentNode()->ensureComputedStyle() : nullptr;
             position = parentStyle ? ComputedStyle::resolveAlignment(*parentStyle, style, resolveAlignmentAuto(parentStyle->alignItemsPosition(), parentStyle)) : ItemPositionStart;
         }
         return valueForItemPositionWithOverflowAlignment(position, style.alignSelfOverflowAlignment(), NonLegacyPosition);
     }
     case CSSPropertyFlex:
         return valuesForShorthandProperty(flexShorthand(), style, layoutObject, styledNode, allowVisitedStyle);
     case CSSPropertyFlexBasis:
         return zoomAdjustedPixelValueForLength(style.flexBasis(), style);
     case CSSPropertyFlexDirection:
         return cssValuePool().createValue(style.flexDirection());
     case CSSPropertyFlexFlow:
         return valuesForShorthandProperty(flexFlowShorthand(), style, layoutObject, styledNode, allowVisitedStyle);
     case CSSPropertyFlexGrow:
         return cssValuePool().createValue(style.flexGrow(), CSSPrimitiveValue::UnitType::Number);
     case CSSPropertyFlexShrink:
         return cssValuePool().createValue(style.flexShrink(), CSSPrimitiveValue::UnitType::Number);
     case CSSPropertyFlexWrap:
         return cssValuePool().createValue(style.flexWrap());
     case CSSPropertyJustifyContent:
-        return valueForContentPositionAndDistributionWithOverflowAlignment(resolveJustifyContentAuto(style));
+        return valueForContentPositionAndDistributionWithOverflowAlignment(style.justifyContent());
     case CSSPropertyOrder:
         return cssValuePool().createValue(style.order(), CSSPrimitiveValue::UnitType::Number);
     case CSSPropertyFloat:
         if (style.display() != NONE && style.hasOutOfFlowPosition())
             return cssValuePool().createIdentifierValue(CSSValueNone);
         return cssValuePool().createValue(style.floating());
     case CSSPropertyFont:
         return valueForFont(style);
     case CSSPropertyFontFamily:
         return valueForFontFamily(style);
@@ skipping 1090 matching lines @@
     case CSSPropertyAll:
         return nullptr;
     default:
         break;
     }
     ASSERT_NOT_REACHED();
     return nullptr;
 }
 
 } // namespace blink