Remove LayoutState.

sky/engine/core/rendering/RenderBlock.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 243 matching lines @@
         deleteLineBoxTree();
 }
 
 bool RenderBlock::widthAvailableToChildrenHasChanged()
 {
     bool widthAvailableToChildrenHasChanged = m_hasBorderOrPaddingLogicalWidthChanged;
     m_hasBorderOrPaddingLogicalWidthChanged = false;
 
     // If we use border-box sizing, have percentage padding, and our parent has changed width then the width available to our children has changed even
     // though our own width has remained the same.
-    widthAvailableToChildrenHasChanged |= style()->boxSizing() == BORDER_BOX && needsPreferredWidthsRecalculation() && view()->layoutState()->containingBlockLogicalWidthChanged();

[ojan, 2015/02/20 20:14:32]

This is the potential change in behavior that's in theory covered by the added
test case.

+    widthAvailableToChildrenHasChanged |= style()->boxSizing() == BORDER_BOX && needsPreferredWidthsRecalculation();
 
     return widthAvailableToChildrenHasChanged;
 }
 
 bool RenderBlock::updateLogicalWidthAndColumnWidth()
 {
     LayoutUnit oldWidth = logicalWidth();
     updateLogicalWidth();
     return oldWidth != logicalWidth() || widthAvailableToChildrenHasChanged();
 }
@@ skipping 68 matching lines @@
 bool RenderBlock::simplifiedLayout()
 {
     // Check if we need to do a full layout.
     if (normalChildNeedsLayout() || selfNeedsLayout())
         return false;
 
     // Check that we actually need to do a simplified layout.
     if (!posChildNeedsLayout() && !(needsSimplifiedNormalFlowLayout() || needsPositionedMovementLayout()))
         return false;
 
+    if (needsPositionedMovementLayout() && !tryLayoutDoingPositionedMovementOnly())
+        return false;
 
-    {
-        // LayoutState needs this deliberate scope to pop before paint invalidation.
-        LayoutState state(*this, locationOffset());
+    // Lay out positioned descendants or objects that just need to recompute overflow.
+    if (needsSimplifiedNormalFlowLayout())
+        simplifiedNormalFlowLayout();
 
-        if (needsPositionedMovementLayout() && !tryLayoutDoingPositionedMovementOnly())
-            return false;
+    if (posChildNeedsLayout() || needsPositionedMovementLayout())
+        layoutPositionedObjects(false, needsPositionedMovementLayout() ? ForcedLayoutAfterContainingBlockMoved : DefaultLayout);
 
-        // Lay out positioned descendants or objects that just need to recompute overflow.
-        if (needsSimplifiedNormalFlowLayout())
-            simplifiedNormalFlowLayout();
-
-        if (posChildNeedsLayout() || needsPositionedMovementLayout())
-            layoutPositionedObjects(false, needsPositionedMovementLayout() ? ForcedLayoutAfterContainingBlockMoved : DefaultLayout);
-
-        // Recompute our overflow information.
-        // FIXME: We could do better here by computing a temporary overflow object from layoutPositionedObjects and only
-        // updating our overflow if we either used to have overflow or if the new temporary object has overflow.
-        // For now just always recompute overflow. This is no worse performance-wise than the old code that called rightmostPosition and
-        // lowestPosition on every relayout so it's not a regression.
-        // computeOverflow expects the bottom edge before we clamp our height. Since this information isn't available during
-        // simplifiedLayout, we cache the value in m_overflow.
-        LayoutUnit oldClientAfterEdge = hasRenderOverflow() ? m_overflow->layoutClientAfterEdge() : clientLogicalBottom();
-        computeOverflow(oldClientAfterEdge, true);
-    }
+    // Recompute our overflow information.
+    // FIXME: We could do better here by computing a temporary overflow object from layoutPositionedObjects and only
+    // updating our overflow if we either used to have overflow or if the new temporary object has overflow.
+    // For now just always recompute overflow. This is no worse performance-wise than the old code that called rightmostPosition and
+    // lowestPosition on every relayout so it's not a regression.
+    // computeOverflow expects the bottom edge before we clamp our height. Since this information isn't available during
+    // simplifiedLayout, we cache the value in m_overflow.
+    LayoutUnit oldClientAfterEdge = hasRenderOverflow() ? m_overflow->layoutClientAfterEdge() : clientLogicalBottom();
+    computeOverflow(oldClientAfterEdge, true);
 
     updateLayerTransformAfterLayout();
 
     clearNeedsLayout();
     return true;
 }
 
 LayoutUnit RenderBlock::marginIntrinsicLogicalWidthForChild(RenderBox* child) const
 {
     // A margin has three types: fixed, percentage, and auto (variable).
@@ skipping 1350 matching lines @@
 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* markedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const RenderObject* obj) const
 {
     showRenderObject();
     for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox())
         root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLabel2, obj, 1);
 }
 
 #endif
 
 } // namespace blink