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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 271 matching lines @@
             style.setJustifySelf(parentStyle.justifyItems());
     }
 
     // The 'auto' keyword computes to:
     //  - 'stretch' for flex containers and grid containers,
     //  - 'start' for everything else.
     if (style.alignItemsPosition() == ItemPositionAuto) {
         if (isFlexOrGrid)
             style.setAlignItemsPosition(ItemPositionStretch);
     }
-
-    // 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.justifyContentPosition() == ContentPositionAuto) && (style.justifyContentDistribution() == ContentDistributionDefault)) {
-        if (style.isDisplayFlexibleOrGridBox()) {
-            if (style.isDisplayFlexibleBox())
-                style.setJustifyContentPosition(ContentPositionFlexStart);
-            else
-                style.setJustifyContentPosition(ContentPositionStart);
-        }
-    }
-
-    // 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 'stretch'.
-    // Grid Containers: 'auto' computes to 'start', and 'stretch' behaves like 'start'.
-    if (style.alignContentPosition() == ContentPositionAuto && style.alignContentDistribution() == ContentDistributionDefault) {
-        if (style.isDisplayFlexibleOrGridBox()) {
-            if (style.isDisplayFlexibleBox())
-                style.setAlignContentDistribution(ContentDistributionStretch);
-            else
-                style.setAlignContentPosition(ContentPositionStart);
-        }
-    }
 }
 
 void StyleAdjuster::adjustStyleForHTMLElement(ComputedStyle& style, const ComputedStyle& parentStyle, HTMLElement& element)
 {
     // <div> and <span> are the most common elements on the web, we skip all the work for them.
     if (isHTMLDivElement(element) || isHTMLSpanElement(element))
         return;
 
     if (isHTMLTableCellElement(element)) {
         // FIXME: We shouldn't be overriding start/-webkit-auto like this. Do it in html.css instead.
@@ skipping 129 matching lines @@
         // We want to count vertical percentage paddings/margins on flex items because our current
         // behavior is different from the spec and we want to gather compatibility data.
         if (style.paddingBefore().hasPercent() || style.paddingAfter().hasPercent())
             UseCounter::count(document, UseCounter::FlexboxPercentagePaddingVertical);
         if (style.marginBefore().hasPercent() || style.marginAfter().hasPercent())
             UseCounter::count(document, UseCounter::FlexboxPercentageMarginVertical);
     }
 }
 
 } // namespace blink