[css-align] New CSS Value 'normal' for Self 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 416 matching lines @@
         direction = CSSPrimitiveValue::createIdentifier(CSSValueLeft);
         break;
     case ReflectionRight:
         direction = CSSPrimitiveValue::createIdentifier(CSSValueRight);
         break;
     }
 
     return CSSReflectValue::create(direction, offset, valueForNinePieceImage(reflection->mask(), style));
 }
 
-static ItemPosition resolveAlignmentAuto(ItemPosition position, const ComputedStyle* style)
-{
-    if (position != ItemPositionAuto)
-        return position;
-
-    if (!RuntimeEnabledFeatures::cssGridLayoutEnabled())
-        return ItemPositionStretch;
-
-    return isFlexOrGrid(style) ? ItemPositionStretch : ItemPositionStart;
-}
-
-static CSSValueList* valueForItemPositionWithOverflowAlignment(ItemPosition itemPosition, OverflowAlignment overflowAlignment, ItemPositionType positionType)
+static CSSValueList* valueForItemPositionWithOverflowAlignment(const StyleSelfAlignmentData& data)
 {
     CSSValueList* result = CSSValueList::createSpaceSeparated();
-    if (positionType == LegacyPosition)
+    if (data.positionType() == LegacyPosition)
         result->append(*CSSPrimitiveValue::createIdentifier(CSSValueLegacy));
-    result->append(*CSSPrimitiveValue::create(itemPosition));
-    if (itemPosition >= ItemPositionCenter && overflowAlignment != OverflowAlignmentDefault)
-        result->append(*CSSPrimitiveValue::create(overflowAlignment));
+    // To avoid needing to copy the RareNonInheritedData, we repurpose the 'auto' flag to not just mean 'auto' prior to running the StyleAdjuster but also mean 'normal' after running it.
+    result->append(*CSSPrimitiveValue::create(data.position() == ItemPositionAuto ? ItemPositionNormal : data.position()));
+    if (data.position() >= ItemPositionCenter && data.overflow() != OverflowAlignmentDefault)
+        result->append(*CSSPrimitiveValue::create(data.overflow()));
     ASSERT(result->length() <= 2);
     return result;
 }
 
 static CSSValueList* valuesForGridShorthand(const StylePropertyShorthand& shorthand, const ComputedStyle& style, const LayoutObject* layoutObject, Node* styledNode, bool allowVisitedStyle)
 {
     CSSValueList* list = CSSValueList::createSlashSeparated();
     for (size_t i = 0; i < shorthand.length(); ++i) {
         const CSSValue* value = ComputedStyleCSSValueMapping::get(shorthand.properties()[i], style, layoutObject, styledNode, allowVisitedStyle);
         ASSERT(value);
@@ skipping 1399 matching lines @@
     }
     case CSSPropertyDirection:
         return CSSPrimitiveValue::create(style.direction());
     case CSSPropertyDisplay:
         return CSSPrimitiveValue::create(style.display());
     case CSSPropertyEmptyCells:
         return CSSPrimitiveValue::create(style.emptyCells());
     case CSSPropertyAlignContent:
         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);
-    }
+        return valueForItemPositionWithOverflowAlignment(style.alignItems());
+    case CSSPropertyAlignSelf:
+        return valueForItemPositionWithOverflowAlignment(style.alignSelf());
     case CSSPropertyFlex:
         return valuesForShorthandProperty(flexShorthand(), style, layoutObject, styledNode, allowVisitedStyle);
     case CSSPropertyFlexBasis:
         return zoomAdjustedPixelValueForLength(style.flexBasis(), style);
     case CSSPropertyFlexDirection:
         return CSSPrimitiveValue::create(style.flexDirection());
     case CSSPropertyFlexFlow:
         return valuesForShorthandProperty(flexFlowShorthand(), style, layoutObject, styledNode, allowVisitedStyle);
     case CSSPropertyFlexGrow:
         return CSSPrimitiveValue::create(style.flexGrow(), CSSPrimitiveValue::UnitType::Number);
@@ skipping 134 matching lines @@
         return CSSStringValue::create(style.hyphenationString());
     case CSSPropertyImageRendering:
         return CSSPrimitiveValue::create(style.imageRendering());
     case CSSPropertyImageOrientation:
         if (style.respectImageOrientation() == RespectImageOrientation)
             return CSSPrimitiveValue::createIdentifier(CSSValueFromImage);
         return CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Degrees);
     case CSSPropertyIsolation:
         return CSSPrimitiveValue::create(style.isolation());
     case CSSPropertyJustifyItems:
-        return valueForItemPositionWithOverflowAlignment(resolveAlignmentAuto(style.justifyItemsPosition(), &style), style.justifyItemsOverflowAlignment(), style.justifyItemsPositionType());
-    case CSSPropertyJustifySelf: {
-        Node* parent = styledNode->parentNode();
-        return valueForItemPositionWithOverflowAlignment(resolveAlignmentAuto(style.justifySelfPosition(), parent ? parent->ensureComputedStyle() : nullptr), style.justifySelfOverflowAlignment(), NonLegacyPosition);
-    }
+        return valueForItemPositionWithOverflowAlignment(style.justifyItems());
+    case CSSPropertyJustifySelf:
+        return valueForItemPositionWithOverflowAlignment(style.justifySelf());
     case CSSPropertyLeft:
         return valueForPositionOffset(style, CSSPropertyLeft, layoutObject);
     case CSSPropertyLetterSpacing:
         if (!style.letterSpacing())
             return CSSPrimitiveValue::createIdentifier(CSSValueNormal);
         return zoomAdjustedPixelValue(style.letterSpacing(), style);
     case CSSPropertyWebkitLineClamp:
         if (style.lineClamp().isNone())
             return CSSPrimitiveValue::createIdentifier(CSSValueNone);
         return CSSPrimitiveValue::create(style.lineClamp().value(), style.lineClamp().isPercentage() ? CSSPrimitiveValue::UnitType::Percentage : CSSPrimitiveValue::UnitType::Number);
@@ skipping 949 matching lines @@
     case CSSPropertyAll:
         return nullptr;
     default:
         break;
     }
     ASSERT_NOT_REACHED();
     return nullptr;
 }
 
 } // namespace blink