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

third_party/WebKit/Source/core/layout/LayoutBox.cpp

Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
index 5a0eaf34a18a7d7105d53cd90dec1d3156a299d2..ba2da7f13f34efe35d748aec9274e55b946dd0a2 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -2212,7 +2212,7 @@ static bool columnFlexItemHasStretchAlignment(const LayoutObject* flexitem)
     ASSERT(parent->style()->isColumnFlexDirection());
     if (flexitem->style()->marginStart().isAuto() || flexitem->style()->marginEnd().isAuto())
         return false;
-    return flexitem->style()->alignSelfPosition() == ItemPositionStretch || (flexitem->style()->alignSelfPosition() == ItemPositionAuto && parent->style()->alignItemsPosition() == ItemPositionStretch);
+    return flexitem->styleRef().resolvedAlignSelf(parent->styleRef(), ItemPositionStretch).position() == ItemPositionStretch;
 }
 
 static bool isStretchingColumnFlexItem(const LayoutObject* flexitem)
@@ -2240,8 +2240,8 @@ bool LayoutBox::hasStretchedLogicalWidth() const
         return false;
     }
     if (cb->isHorizontalWritingMode() != isHorizontalWritingMode())
-        return ComputedStyle::resolveAlignment(cb->styleRef(), style, ItemPositionStretch) == ItemPositionStretch;
-    return ComputedStyle::resolveJustification(cb->styleRef(), style, ItemPositionStretch) == ItemPositionStretch;
+        return style.resolvedAlignSelf(cb->styleRef(), ItemPositionStretch).position() == ItemPositionStretch;
+    return style.resolvedJustifySelf(cb->styleRef(), ItemPositionStretch).position() == ItemPositionStretch;
 }
 
 bool LayoutBox::sizesLogicalWidthToFitContent(const Length& logicalWidth) const