[CSS Grid Layout] Don't resolve align-self and justify-self properties

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 252 matching lines @@
 
     // If the inherited value of justify-items includes the legacy keyword, 'auto'
     // computes to the the inherited value.
     // Otherwise, auto computes to:
     //  - 'stretch' for flex containers and grid containers.
     //  - 'start' for everything else.
     if (style.justifyItems() == ItemPositionAuto) {
         if (parentStyle.justifyItemsPositionType() == LegacyPosition) {
             style.setJustifyItems(parentStyle.justifyItems());
             style.setJustifyItemsPositionType(parentStyle.justifyItemsPositionType());
-        } else if (isFlexOrGrid) {
-            style.setJustifyItems(ItemPositionStretch);
+        } else {
+            style.setJustifyItems(isFlexOrGrid ? ItemPositionStretch : ItemPositionStart);
         }
     }
 
     // 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) {
-            style.setJustifySelf(ItemPositionStretch);
-        } else {
-            style.setJustifySelf(parentStyle.justifyItems());
-            style.setJustifySelfOverflowAlignment(parentStyle.justifyItemsOverflowAlignment());
-        }
-    }
+    // any 'legacy' keywords) on all other boxes (to be resolved during the layout).
+    if ((style.justifySelf() == ItemPositionAuto) && absolutePositioned)
+        style.setJustifySelf(ItemPositionStretch);
 
     // The 'auto' keyword computes to:
     //  - 'stretch' for flex containers and grid containers,
     //  - 'start' for everything else.
-    if (style.alignItems() == ItemPositionAuto) {
-        if (isFlexOrGrid)
-            style.setAlignItems(ItemPositionStretch);
-    }
+    if (style.alignItems() == ItemPositionAuto)
+        style.setAlignItems(isFlexOrGrid ? ItemPositionStretch : ItemPositionStart);
 
     // 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) {
-            style.setAlignSelf(ItemPositionStretch);
-        } else {
-            style.setAlignSelf(parentStyle.alignItems());
-            style.setAlignSelfOverflowAlignment(parentStyle.alignItemsOverflowAlignment());
-        }
-    }
+    // any 'legacy' keywords) on all other boxes (to be resolved during the layout).
+    if ((style.alignSelf() == ItemPositionAuto) && absolutePositioned)
+        style.setAlignSelf(ItemPositionStretch);
 }
 
 void StyleAdjuster::adjustStyleForTagName(RenderStyle* style, RenderStyle* parentStyle, Element& 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)) {
         // If we have a <td> that specifies a float property, in quirks mode we just drop the float property.
@@ skipping 141 matching lines @@
     if (style->writingMode() != TopToBottomWritingMode && (style->display() == BOX || style->display() == INLINE_BOX))
         style->setWritingMode(TopToBottomWritingMode);
 
     if (parentStyle->isDisplayFlexibleOrGridBox()) {
         style->setFloating(NoFloat);
         style->setDisplay(equivalentBlockDisplay(style->display(), style->isFloating(), !m_useQuirksModeStyles));
     }
 }
 
 }