Remove LayoutState.

sky/engine/core/rendering/RenderView.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. 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
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 25 matching lines @@
 
 namespace blink {
 
 RenderView::RenderView(Document* document)
     : RenderBlockFlow(document)
     , m_frameView(document->view())
     , m_selectionStart(nullptr)
     , m_selectionEnd(nullptr)
     , m_selectionStartPos(-1)
     , m_selectionEndPos(-1)
-    , m_layoutState(0)
     , m_renderCounterCount(0)
     , m_hitTestCount(0)
 {
     // init RenderObject attributes
     setInline(false);
 
     m_minPreferredLogicalWidth = 0;
     m_maxPreferredLogicalWidth = 0;
 
     setPreferredLogicalWidthsDirty(MarkOnlyThis);
@@ skipping 63 matching lines @@
 LayoutUnit RenderView::availableLogicalHeight(AvailableLogicalHeightType heightType) const
 {
     return RenderBlockFlow::availableLogicalHeight(heightType);
 }
 
 bool RenderView::isChildAllowed(RenderObject* child, RenderStyle*) const
 {
     return child->isBox();
 }
 
-void RenderView::layoutContent()
-{
-    ASSERT(needsLayout());
-
-    RenderBlockFlow::layout();
-
-#if ENABLE(ASSERT)
-    checkLayoutState();
-#endif
-}
-
-#if ENABLE(ASSERT)
-void RenderView::checkLayoutState()
-{
-    ASSERT(!m_layoutState->next());
-}
-#endif
-
 void RenderView::layout()
 {
     SubtreeLayoutScope layoutScope(*this);
 
     bool relayoutChildren = (!m_frameView || width() != viewWidth() || height() != viewHeight());
     if (relayoutChildren) {
         layoutScope.setChildNeedsLayout(this);
         for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
             if ((child->isBox() && toRenderBox(child)->hasRelativeLogicalHeight())
                     || child->style()->logicalHeight().isPercent()
                     || child->style()->logicalMinHeight().isPercent()
                     || child->style()->logicalMaxHeight().isPercent())
                 layoutScope.setChildNeedsLayout(child);
         }
     }
 
-    ASSERT(!m_layoutState);
     if (!needsLayout())
         return;
 
-    LayoutState rootLayoutState(*this);
-
-    layoutContent();
-
-#if ENABLE(ASSERT)
-    checkLayoutState();
-#endif
+    RenderBlockFlow::layout();
     clearNeedsLayout();
 }
 
 void RenderView::mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState& transformState, MapCoordinatesFlags mode) const
 {
     if (!paintInvalidationContainer && mode & UseTransforms && shouldUseTransformFromContainer(0)) {
         TransformationMatrix t;
         getTransformFromContainer(0, LayoutSize(), t);
         transformState.applyTransform(t);
     }
@@ skipping 215 matching lines @@
 int RenderView::viewLogicalHeight() const
 {
     return viewHeight();
 }
 
 LayoutUnit RenderView::viewLogicalHeightForPercentages() const
 {
     return viewLogicalHeight();
 }
 
-void RenderView::pushLayoutState(LayoutState& layoutState)
-{
-    m_layoutState = &layoutState;
-}
-
-void RenderView::popLayoutState()
-{
-    ASSERT(m_layoutState);
-    m_layoutState = m_layoutState->next();
-}
-
 // FIXME(sky): remove
 double RenderView::layoutViewportWidth() const
 {
     return viewWidth();
 }
 
 // FIXME(sky): remove
 double RenderView::layoutViewportHeight() const
 {
     return viewHeight();
 }
 
 void RenderView::addIFrame(RenderIFrame* iframe)
 {
     m_iframes.add(iframe);
 }
 
 void RenderView::removeIFrame(RenderIFrame* iframe)
 {
     m_iframes.remove(iframe);
 }
 
 void RenderView::updateIFramesAfterLayout()
 {
     for (auto& iframe: m_iframes)
         iframe->updateWidgetBounds();
 }
 
 } // namespace blink