[css-align] Use the layout parent style to determine the value of alignment-related properties.

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/)
@@ skipping 141 matching lines @@
   if (style.styleType() != PseudoIdFirstLetter)
     return;
 
   // Force inline display (except for floating first-letters).
   style.setDisplay(style.isFloating() ? EDisplay::Block : EDisplay::Inline);
 
   // CSS2 says first-letter can't be positioned.
   style.setPosition(EPosition::kStatic);
 }
 
-void StyleAdjuster::adjustStyleForAlignment(ComputedStyle& style,
-                                            const ComputedStyle& parentStyle) {
+void StyleAdjuster::adjustStyleForAlignment(
+    ComputedStyle& style,
+    const ComputedStyle& layoutParentStyle) {
   // 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.
 
   // If the inherited value of justify-items includes the 'legacy' keyword,
   // 'auto' computes to the the inherited value.  Otherwise, 'auto' computes to
   // 'normal'.
   if (style.justifyItemsPosition() == ItemPositionAuto) {
-    if (parentStyle.justifyItemsPositionType() == LegacyPosition)
-      style.setJustifyItems(parentStyle.justifyItems());
+    if (layoutParentStyle.justifyItemsPositionType() == LegacyPosition)
+      style.setJustifyItems(layoutParentStyle.justifyItems());
   }
 
   // The 'auto' keyword computes the computed value of justify-items on the
   // parent (minus any legacy keywords), or 'normal' if the box has no parent.
   if (style.justifySelfPosition() == ItemPositionAuto) {
-    if (parentStyle.justifyItemsPositionType() == LegacyPosition)
-      style.setJustifySelfPosition(parentStyle.justifyItemsPosition());
-    else if (parentStyle.justifyItemsPosition() != ItemPositionAuto)
-      style.setJustifySelf(parentStyle.justifyItems());
+    if (layoutParentStyle.justifyItemsPositionType() == LegacyPosition)
+      style.setJustifySelfPosition(layoutParentStyle.justifyItemsPosition());
+    else if (layoutParentStyle.justifyItemsPosition() != ItemPositionAuto)
+      style.setJustifySelf(layoutParentStyle.justifyItems());
   }
 
   // The 'auto' keyword computes the computed value of align-items on the parent
   // or 'normal' if the box has no parent.
   if (style.alignSelfPosition() == ItemPositionAuto &&
-      parentStyle.alignItemsPosition() !=
+      layoutParentStyle.alignItemsPosition() !=
           ComputedStyle::initialDefaultAlignment().position())
-    style.setAlignSelf(parentStyle.alignItems());
+    style.setAlignSelf(layoutParentStyle.alignItems());
 }
 
 static void adjustStyleForHTMLElement(ComputedStyle& style,
                                       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)) {
@@ skipping 298 matching lines @@
 
     // SVG text layout code expects us to be a block-level style element.
     if ((isSVGForeignObjectElement(*element) || isSVGTextElement(*element)) &&
         style.isDisplayInlineType())
       style.setDisplay(EDisplay::Block);
 
     // Columns don't apply to svg text elements.
     if (isSVGTextElement(*element))
       style.clearMultiCol();
   }
-  adjustStyleForAlignment(style, parentStyle);
+  adjustStyleForAlignment(style, layoutParentStyle);
 }
 
 }  // namespace blink