| Index: sky/engine/core/rendering/RenderFlexibleBox.cpp
|
| diff --git a/sky/engine/core/rendering/RenderFlexibleBox.cpp b/sky/engine/core/rendering/RenderFlexibleBox.cpp
|
| index 73a2041cad934cb4ca6296db99fb99af1b72a2cd..ab3ad84fe9c98825914cfed384e423fefed2369f 100644
|
| --- a/sky/engine/core/rendering/RenderFlexibleBox.cpp
|
| +++ b/sky/engine/core/rendering/RenderFlexibleBox.cpp
|
| @@ -213,16 +213,14 @@ void RenderFlexibleBox::styleDidChange(StyleDifference diff, const RenderStyle*
|
| }
|
| }
|
|
|
| -void RenderFlexibleBox::layoutBlock(bool relayoutChildren)
|
| +void RenderFlexibleBox::layout()
|
| {
|
| ASSERT(needsLayout());
|
|
|
| - if (!relayoutChildren && simplifiedLayout())
|
| + if (simplifiedLayout())
|
| return;
|
|
|
| - if (updateLogicalWidthAndColumnWidth())
|
| - relayoutChildren = true;
|
| -
|
| + bool relayoutChildren = updateLogicalWidthAndColumnWidth();
|
| LayoutUnit previousHeight = logicalHeight();
|
| setLogicalHeight(borderAndPaddingLogicalHeight());
|
|
|
|
|