| Index: sky/engine/core/rendering/RenderBlockFlow.cpp
|
| diff --git a/sky/engine/core/rendering/RenderBlockFlow.cpp b/sky/engine/core/rendering/RenderBlockFlow.cpp
|
| index 834241c5c8beb17f6089a98a766209aa959d83fd..194dabea715651607a3d16dd74c9339b41b89cd7 100644
|
| --- a/sky/engine/core/rendering/RenderBlockFlow.cpp
|
| +++ b/sky/engine/core/rendering/RenderBlockFlow.cpp
|
| @@ -65,17 +65,17 @@ bool RenderBlockFlow::updateLogicalWidthAndColumnWidth()
|
| return RenderBlock::updateLogicalWidthAndColumnWidth();
|
| }
|
|
|
| -void RenderBlockFlow::layoutBlock(bool relayoutChildren)
|
| +void RenderBlockFlow::layout()
|
| {
|
| ASSERT(needsLayout());
|
| ASSERT(isInlineBlock() || !isInline());
|
|
|
| - if (!relayoutChildren && simplifiedLayout())
|
| + if (simplifiedLayout())
|
| return;
|
|
|
| SubtreeLayoutScope layoutScope(*this);
|
|
|
| - layoutBlockFlow(relayoutChildren, layoutScope);
|
| + layoutBlockFlow(layoutScope);
|
|
|
| updateLayerTransformAfterLayout();
|
|
|
| @@ -86,11 +86,11 @@ void RenderBlockFlow::layoutBlock(bool relayoutChildren)
|
| clearNeedsLayout();
|
| }
|
|
|
| -inline void RenderBlockFlow::layoutBlockFlow(bool relayoutChildren, SubtreeLayoutScope& layoutScope)
|
| +inline void RenderBlockFlow::layoutBlockFlow(SubtreeLayoutScope& layoutScope)
|
| {
|
| LayoutUnit oldLeft = logicalLeft();
|
| bool logicalWidthChanged = updateLogicalWidthAndColumnWidth();
|
| - relayoutChildren |= logicalWidthChanged;
|
| + bool relayoutChildren = logicalWidthChanged;
|
|
|
| LayoutState state(*this, locationOffset(), logicalWidthChanged);
|
|
|
|
|