Change LayoutState to be stack-allocated

Source/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 39 matching lines @@
 RenderView::RenderView(Document* document)
     : RenderBlockFlow(document)
     , m_frameView(document->view())
     , m_selectionStart(0)
     , m_selectionEnd(0)
     , m_selectionStartPos(-1)
     , m_selectionEndPos(-1)
     , m_pageLogicalHeight(0)
     , m_pageLogicalHeightChanged(false)
     , m_layoutState(0)
-    , m_layoutStateDisableCount(0)
     , m_renderQuoteHead(0)
     , m_renderCounterCount(0)
 {
     // init RenderObject attributes
     setInline(false);
 
     m_minPreferredLogicalWidth = 0;
     m_maxPreferredLogicalWidth = 0;
 
     setPreferredLogicalWidthsDirty(MarkOnlyThis);
@@ skipping 105 matching lines @@
     checkLayoutState();
 #endif
 }
 
 #ifndef NDEBUG
 void RenderView::checkLayoutState()
 {
     if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) {
         ASSERT(layoutDeltaMatches(LayoutSize()));
     }
-    ASSERT(!m_layoutStateDisableCount);
     ASSERT(!m_layoutState->next());
 }
 #endif
 
 bool RenderView::shouldDoFullRepaintForNextLayout() const
 {
     // It's hard to predict here which of full repaint or per-descendant repaint costs less.
     // For vertical writing mode or width change it's more likely that per-descendant repaint
     // eventually turns out to be full repaint but with the cost to handle more layout states
     // and discrete repaint rects, so marking full repaint here is more likely to cost less.
@@ skipping 48 matching lines @@
         }
 
         if (document().svgExtensions())
             document().accessSVGExtensions().invalidateSVGRootsWithRelativeLengthDescendents(&layoutScope);
     }
 
     ASSERT(!m_layoutState);
     if (!needsLayout())
         return;
 
-    RootLayoutStateScope rootLayoutStateScope(*this);
+    LayoutState rootLayoutState(pageLogicalHeight(), pageLogicalHeightChanged(), *this);
 
     m_pageLogicalHeightChanged = false;
 
     layoutContent();
 
 #ifndef NDEBUG
     checkLayoutState();
 #endif
     clearNeedsLayout();
 }
@@ skipping 185 matching lines @@
 void RenderView::invalidateTreeAfterLayout(const RenderLayerModelObject& paintInvalidationContainer)
 {
     ASSERT(RuntimeEnabledFeatures::repaintAfterLayoutEnabled());
     ASSERT(!needsLayout());
 
     // We specifically need to repaint the viewRect since other renderers
     // short-circuit on full-repaint.
     if (doingFullRepaint() && !viewRect().isEmpty())
         repaintViewRectangle(viewRect());
 
+    LayoutState rootLayoutState(0, false, *this);
     RenderBlock::invalidateTreeAfterLayout(paintInvalidationContainer);
 }
 
 void RenderView::repaintViewRectangle(const LayoutRect& repaintRect) const
 {
     ASSERT(!repaintRect.isEmpty());
 
     if (document().printing() || !m_frameView)
         return;
 
@@ skipping 429 matching lines @@
     if (shouldUsePrintingLayout())
         return pageLogicalHeight();
     return viewLogicalHeight();
 }
 
 float RenderView::zoomFactor() const
 {
     return m_frameView->frame().pageZoomFactor();
 }
 
-void RenderView::pushLayoutState(RenderObject& root)
-{
-    ASSERT(m_layoutStateDisableCount == 0);
-    ASSERT(m_layoutState == 0);
-
-    pushLayoutStateForCurrentFlowThread(root);
-    m_layoutState = new LayoutState(root);
-}
-
-bool RenderView::shouldDisableLayoutStateForSubtree(RenderObject& renderer) const
-{
-    RenderObject* o = &renderer;
-    while (o) {
-        if (o->shouldDisableLayoutState())
-            return true;
-        o = o->container();
-    }
-    return false;
-}
-
 void RenderView::updateHitTestResult(HitTestResult& result, const LayoutPoint& point)
 {
     if (result.innerNode())
         return;
 
     Node* node = document().documentElement();
     if (node) {
         result.setInnerNode(node);
         if (!result.innerNonSharedNode())
             result.setInnerNonSharedNode(node);
@@ skipping 25 matching lines @@
 }
 
 FlowThreadController* RenderView::flowThreadController()
 {
     if (!m_flowThreadController)
         m_flowThreadController = FlowThreadController::create();
 
     return m_flowThreadController.get();
 }
 
-void RenderView::pushLayoutStateForCurrentFlowThread(const RenderObject& object)
+void RenderView::pushLayoutState(LayoutState& layoutState)
 {
+    m_layoutState = &layoutState;

[esprehn, 2014/06/13 23:25:26]

Can we unify the pushLayoutState and setLayoutState paths?

[leviw_travelin_and_unemployed, 2014/06/13 23:46:16]

This is actually leftover from where I broke multicolumn. setLayoutState isn't
used anymore, and shouldn't exist.

     if (!m_flowThreadController)
         return;
 
     RenderFlowThread* currentFlowThread = m_flowThreadController->currentRenderFlowThread();
     if (!currentFlowThread)
         return;
 
-    currentFlowThread->pushFlowThreadLayoutState(object);
+    currentFlowThread->pushFlowThreadLayoutState(layoutState.renderer());
 }
 
-void RenderView::popLayoutStateForCurrentFlowThread()
+void RenderView::popLayoutState()
 {
+    ASSERT(m_layoutState);
+    m_layoutState = m_layoutState->next();
     if (!m_flowThreadController)
         return;
 
     RenderFlowThread* currentFlowThread = m_flowThreadController->currentRenderFlowThread();
     if (!currentFlowThread)
         return;
 
     currentFlowThread->popFlowThreadLayoutState();
 }
 
@@ skipping 19 matching lines @@
     return viewWidth(IncludeScrollbars) / scale;
 }
 
 double RenderView::layoutViewportHeight() const
 {
     float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1;
     return viewHeight(IncludeScrollbars) / scale;
 }
 
 } // namespace WebCore