| Index: sky/engine/core/rendering/RenderView.cpp
|
| diff --git a/sky/engine/core/rendering/RenderView.cpp b/sky/engine/core/rendering/RenderView.cpp
|
| index cfb881439566d1aa0765e0a8eec28b6ab6056a49..cca1de57b9639bbc2b5d89dd20dd7485f697b99e 100644
|
| --- a/sky/engine/core/rendering/RenderView.cpp
|
| +++ b/sky/engine/core/rendering/RenderView.cpp
|
| @@ -43,7 +43,6 @@ RenderView::RenderView(Document* document)
|
| , m_selectionEnd(nullptr)
|
| , m_selectionStartPos(-1)
|
| , m_selectionEndPos(-1)
|
| - , m_layoutState(0)
|
| , m_renderCounterCount(0)
|
| , m_hitTestCount(0)
|
| {
|
| @@ -127,24 +126,6 @@ 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);
|
| @@ -161,17 +142,10 @@ void RenderView::layout()
|
| }
|
| }
|
|
|
| - ASSERT(!m_layoutState);
|
| if (!needsLayout())
|
| return;
|
|
|
| - LayoutState rootLayoutState(*this);
|
| -
|
| - layoutContent();
|
| -
|
| -#if ENABLE(ASSERT)
|
| - checkLayoutState();
|
| -#endif
|
| + RenderBlockFlow::layout();
|
| clearNeedsLayout();
|
| }
|
|
|
| @@ -407,17 +381,6 @@ 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
|
| {
|
|
|