| Index: sky/engine/core/rendering/RenderFlexibleBox.cpp
|
| diff --git a/sky/engine/core/rendering/RenderFlexibleBox.cpp b/sky/engine/core/rendering/RenderFlexibleBox.cpp
|
| index e50ed6ea4a64ab4a7b8cb9b91a619eb302eb6e7a..cb22cd24bd5b6c9690f5f977ab9f9f62515811e8 100644
|
| --- a/sky/engine/core/rendering/RenderFlexibleBox.cpp
|
| +++ b/sky/engine/core/rendering/RenderFlexibleBox.cpp
|
| @@ -224,26 +224,22 @@ void RenderFlexibleBox::layout()
|
| LayoutUnit previousHeight = logicalHeight();
|
| setLogicalHeight(borderAndPaddingLogicalHeight());
|
|
|
| - {
|
| - LayoutState state(*this, locationOffset());
|
| -
|
| - m_numberOfInFlowChildrenOnFirstLine = -1;
|
| + m_numberOfInFlowChildrenOnFirstLine = -1;
|
|
|
| - prepareOrderIteratorAndMargins();
|
| + prepareOrderIteratorAndMargins();
|
|
|
| - ChildFrameRects oldChildRects;
|
| - appendChildFrameRects(oldChildRects);
|
| + ChildFrameRects oldChildRects;
|
| + appendChildFrameRects(oldChildRects);
|
|
|
| - layoutFlexItems(relayoutChildren);
|
| + layoutFlexItems(relayoutChildren);
|
|
|
| - if (logicalHeight() != previousHeight)
|
| - relayoutChildren = true;
|
| + if (logicalHeight() != previousHeight)
|
| + relayoutChildren = true;
|
|
|
| - layoutPositionedObjects(relayoutChildren);
|
| + layoutPositionedObjects(relayoutChildren);
|
|
|
| - // FIXME: css3/flexbox/repaint-rtl-column.html seems to issue paint invalidations for more overflow than it needs to.
|
| - computeOverflow(clientLogicalBottomAfterRepositioning());
|
| - }
|
| + // FIXME: css3/flexbox/repaint-rtl-column.html seems to issue paint invalidations for more overflow than it needs to.
|
| + computeOverflow(clientLogicalBottomAfterRepositioning());
|
|
|
| updateLayerTransformAfterLayout();
|
|
|
|
|