Make LayoutState always be RAII

Source/core/rendering/RenderFlexibleBox.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 223 matching lines @@
 
     LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
     LayoutRectRecorder recorder(*this);
 
     if (updateLogicalWidthAndColumnWidth())
         relayoutChildren = true;
 
     LayoutUnit previousHeight = logicalHeight();
     setLogicalHeight(borderAndPaddingLogicalHeight() + scrollbarLogicalHeight());
 
-    LayoutStateMaintainer statePusher(*this, locationOffset());
+    {
+        LayoutStateMaintainer statePusher(*this, locationOffset());
 
-    RenderFlowThread* flowThread = flowThreadContainingBlock();
-    if (updateRegionsAndShapesLogicalSize(flowThread))
-        relayoutChildren = true;
+        RenderFlowThread* flowThread = flowThreadContainingBlock();
+        if (updateRegionsAndShapesLogicalSize(flowThread))
+            relayoutChildren = true;
 
-    m_numberOfInFlowChildrenOnFirstLine = -1;
+        m_numberOfInFlowChildrenOnFirstLine = -1;
 
-    RenderBlock::startDelayUpdateScrollInfo();
+        RenderBlock::startDelayUpdateScrollInfo();
 
-    prepareOrderIteratorAndMargins();
+        prepareOrderIteratorAndMargins();
 
-    ChildFrameRects oldChildRects;
-    appendChildFrameRects(oldChildRects);
+        ChildFrameRects oldChildRects;
+        appendChildFrameRects(oldChildRects);
 
-    Vector<LineContext> lineContexts;
-    layoutFlexItems(relayoutChildren, lineContexts);
+        layoutFlexItems(relayoutChildren);
 
-    updateLogicalHeight();
-    repositionLogicalHeightDependentFlexItems(lineContexts);
+        RenderBlock::finishDelayUpdateScrollInfo();
 
-    RenderBlock::finishDelayUpdateScrollInfo();
+        if (logicalHeight() != previousHeight)
+            relayoutChildren = true;
 
-    if (logicalHeight() != previousHeight)
-        relayoutChildren = true;
+        layoutPositionedObjects(relayoutChildren || isRoot());
 
-    layoutPositionedObjects(relayoutChildren || isRoot());
+        computeRegionRangeForBlock(flowThread);
 
-    computeRegionRangeForBlock(flowThread);
-
-    repaintChildrenDuringLayoutIfMoved(oldChildRects);
-    // FIXME: css3/flexbox/repaint-rtl-column.html seems to repaint more overflow than it needs to.
-    computeOverflow(clientLogicalBottomAfterRepositioning());
-    statePusher.pop();
+        repaintChildrenDuringLayoutIfMoved(oldChildRects);
+        // FIXME: css3/flexbox/repaint-rtl-column.html seems to repaint more overflow than it needs to.
+        computeOverflow(clientLogicalBottomAfterRepositioning());
+    }
 
     updateLayerTransform();
 
     // Update our scroll information if we're overflow:auto/scroll/hidden now that we know if
     // we overflow or not.
     updateScrollInfoAfterLayout();
 
     repainter.repaintAfterLayout();
 
     clearNeedsLayout();
@@ skipping 375 matching lines @@
             mainAxisExtent = m_intrinsicSizeAlongMainAxis.get(child);
         } else {
             mainAxisExtent = child->maxPreferredLogicalWidth();
         }
         ASSERT(mainAxisExtent - mainAxisBorderAndPaddingExtentForChild(child) >= 0);
         return mainAxisExtent - mainAxisBorderAndPaddingExtentForChild(child);
     }
     return std::max(LayoutUnit(0), computeMainAxisExtentForChild(child, MainOrPreferredSize, flexBasis));
 }
 
-void RenderFlexibleBox::layoutFlexItems(bool relayoutChildren, Vector<LineContext>& lineContexts)
+void RenderFlexibleBox::layoutFlexItems(bool relayoutChildren)
 {
+    Vector<LineContext> lineContexts;
     OrderedFlexItemList orderedChildren;
     LayoutUnit sumFlexBaseSize;
     double totalFlexGrow;
     double totalWeightedFlexShrink;
     LayoutUnit sumHypotheticalMainSize;
 
     Vector<LayoutUnit, 16> childSizes;
 
     m_orderIterator.first();
     LayoutUnit crossAxisOffset = flowAwareBorderBefore() + flowAwarePaddingBefore();
@@ skipping 15 matching lines @@
         // Even if computeNextFlexLine returns true, the flexbox might not have
         // a line because all our children might be out of flow positioned.
         // Instead of just checking if we have a line, make sure the flexbox
         // has at least a line's worth of height to cover this case.
         LayoutUnit minHeight = borderAndPaddingLogicalHeight()
             + lineHeight(true, isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes)
             + scrollbarLogicalHeight();
         if (height() < minHeight)
             setLogicalHeight(minHeight);
     }
+
+    updateLogicalHeight();
+    repositionLogicalHeightDependentFlexItems(lineContexts);
 }
 
 LayoutUnit RenderFlexibleBox::autoMarginOffsetInMainAxis(const OrderedFlexItemList& children, LayoutUnit& availableFreeSpace)
 {
     if (availableFreeSpace <= 0)
         return 0;
 
     int numberOfAutoMargins = 0;
     bool isHorizontal = isHorizontalFlow();
     for (size_t i = 0; i < children.size(); ++i) {
@@ skipping 682 matching lines @@
             ASSERT(child);
             LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisExtent;
             LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge;
             LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxisExtent;
             adjustAlignmentForChild(child, newOffset - originalOffset);
         }
     }
 }
 
 }