| Index: Source/core/rendering/RenderFlexibleBox.cpp
|
| diff --git a/Source/core/rendering/RenderFlexibleBox.cpp b/Source/core/rendering/RenderFlexibleBox.cpp
|
| index 42fed8d2894fbed034511f2eb3439a26ee789173..51454b7179a4eb3ffcc6e7fb45df9a2b67d5c165 100644
|
| --- a/Source/core/rendering/RenderFlexibleBox.cpp
|
| +++ b/Source/core/rendering/RenderFlexibleBox.cpp
|
| @@ -208,8 +208,8 @@ void RenderFlexibleBox::styleDidChange(StyleDifference diff, const RenderStyle*
|
| // Flex items that were previously stretching need to be relayed out so we can compute new available cross axis space.
|
| // This is only necessary for stretching since other alignment values don't change the size of the box.
|
| for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
|
| - ItemPosition previousAlignment = RenderStyle::resolveAlignment(oldStyle, child->style());
|
| - if (previousAlignment == ItemPositionStretch && previousAlignment != RenderStyle::resolveAlignment(style(), child->style()))
|
| + ItemPosition previousAlignment = RenderStyle::resolveAlignment(oldStyle, child->style(), ItemPositionStretch);
|
| + if (previousAlignment == ItemPositionStretch && previousAlignment != RenderStyle::resolveAlignment(style(), child->style(), ItemPositionStretch))
|
| child->setChildNeedsLayout(MarkOnlyThis);
|
| }
|
| }
|
| @@ -1003,7 +1003,7 @@ void RenderFlexibleBox::prepareChildForPositionedLayout(RenderBox& child, Layout
|
|
|
| ItemPosition RenderFlexibleBox::alignmentForChild(RenderBox& child) const
|
| {
|
| - ItemPosition align = RenderStyle::resolveAlignment(style(), child.style());
|
| + ItemPosition align = RenderStyle::resolveAlignment(style(), child.style(), ItemPositionStretch);
|
|
|
| if (align == ItemPositionBaseline && hasOrthogonalFlow(child))
|
| align = ItemPositionFlexStart;
|
|
|