Compute the normal flow list on the fly

Source/core/paint/DeprecatedPaintLayerStackingNode.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 38 matching lines @@
 #include "core/paint/DeprecatedPaintLayer.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 // FIXME: This should not require DeprecatedPaintLayer. There is currently a cycle where
 // in order to determine if we shoulBeTreatedAsStackingContextForPainting() we have to ask the paint
 // layer about some of its state.
 DeprecatedPaintLayerStackingNode::DeprecatedPaintLayerStackingNode(DeprecatedPaintLayer* layer)
     : m_layer(layer)
-    , m_normalFlowListDirty(true)
 #if ENABLE(ASSERT)
     , m_layerListMutationAllowed(true)
     , m_stackingParent(0)
 #endif
 {
     m_isTreatedAsStackingContextForPainting = shouldBeTreatedAsStackingContextForPainting();
 
     // Non-stacking contexts should have empty z-order lists. As this is already the case,
     // there is no need to dirty / recompute these lists.
     m_zOrderListsDirty = isStackingContext();
 }
 
 DeprecatedPaintLayerStackingNode::~DeprecatedPaintLayerStackingNode()
 {
 #if ENABLE(ASSERT)
     if (!layoutObject()->documentBeingDestroyed()) {
         ASSERT(!isInStackingParentZOrderLists());
-        ASSERT(!isInStackingParentNormalFlowList());
 
         updateStackingParentForZOrderLists(0);
-        updateStackingParentForNormalFlowList(0);
     }
 #endif
 }
 
 // Helper for the sorting of layers by z-index.
 static inline bool compareZIndex(DeprecatedPaintLayerStackingNode* first, DeprecatedPaintLayerStackingNode* second)
 {
     return first->zIndex() < second->zIndex();
 }
 
@@ skipping 21 matching lines @@
     if (!layoutObject()->documentBeingDestroyed())
         compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
 }
 
 void DeprecatedPaintLayerStackingNode::dirtyStackingContextZOrderLists()
 {
     if (DeprecatedPaintLayerStackingNode* stackingNode = ancestorStackingContextNode())
         stackingNode->dirtyZOrderLists();
 }
 
-void DeprecatedPaintLayerStackingNode::dirtyNormalFlowList()
-{
-    ASSERT(m_layerListMutationAllowed);
-
-#if ENABLE(ASSERT)
-    updateStackingParentForNormalFlowList(0);
-#endif
-
-    if (m_normalFlowList)
-        m_normalFlowList->clear();
-    m_normalFlowListDirty = true;
-
-    if (!layoutObject()->documentBeingDestroyed())
-        compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
-}
-
 void DeprecatedPaintLayerStackingNode::rebuildZOrderLists()
 {
     ASSERT(m_layerListMutationAllowed);
     ASSERT(isDirtyStackingContext());
 
     for (DeprecatedPaintLayer* child = layer()->firstChild(); child; child = child->nextSibling()) {
         if (!layer()->reflectionInfo() || layer()->reflectionInfo()->reflectionLayer() != child)
             child->stackingNode()->collectLayers(m_posZOrderList, m_negZOrderList);
     }
 
@@ skipping 20 matching lines @@
         }
     }
 
 #if ENABLE(ASSERT)
     updateStackingParentForZOrderLists(this);
 #endif
 
     m_zOrderListsDirty = false;
 }
 
-void DeprecatedPaintLayerStackingNode::updateNormalFlowList()
-{
-    if (!m_normalFlowListDirty)
-        return;
-
-    ASSERT(m_layerListMutationAllowed);
-
-    for (DeprecatedPaintLayer* child = layer()->firstChild(); child; child = child->nextSibling()) {
-        if (!child->stackingNode()->isTreatedAsStackingContextForPainting() && (!layer()->reflectionInfo() || layer()->reflectionInfo()->reflectionLayer() != child)) {
-            if (!m_normalFlowList)
-                m_normalFlowList = adoptPtr(new Vector<DeprecatedPaintLayerStackingNode*>);
-            m_normalFlowList->append(child->stackingNode());
-        }
-    }
-
-#if ENABLE(ASSERT)
-    updateStackingParentForNormalFlowList(this);
-#endif
-
-    m_normalFlowListDirty = false;
-}
-
 void DeprecatedPaintLayerStackingNode::collectLayers(OwnPtr<Vector<DeprecatedPaintLayerStackingNode*>>& posBuffer, OwnPtr<Vector<DeprecatedPaintLayerStackingNode*>>& negBuffer)
 {
     if (layer()->isInTopLayer())
         return;
 
     if (isTreatedAsStackingContextForPainting()) {
         OwnPtr<Vector<DeprecatedPaintLayerStackingNode*>>& buffer = (zIndex() >= 0) ? posBuffer : negBuffer;
         if (!buffer)
             buffer = adoptPtr(new Vector<DeprecatedPaintLayerStackingNode*>);
         buffer->append(this);
@@ skipping 15 matching lines @@
 
     if (m_stackingParent->posZOrderList() && m_stackingParent->posZOrderList()->find(this) != kNotFound)
         return true;
 
     if (m_stackingParent->negZOrderList() && m_stackingParent->negZOrderList()->find(this) != kNotFound)
         return true;
 
     return false;
 }
 
-bool DeprecatedPaintLayerStackingNode::isInStackingParentNormalFlowList() const
-{
-    if (!m_stackingParent || m_stackingParent->normalFlowListDirty())
-        return false;
-
-    return (m_stackingParent->normalFlowList() && m_stackingParent->normalFlowList()->find(this) != kNotFound);
-}
-
 void DeprecatedPaintLayerStackingNode::updateStackingParentForZOrderLists(DeprecatedPaintLayerStackingNode* stackingParent)
 {
     if (m_posZOrderList) {
         for (size_t i = 0; i < m_posZOrderList->size(); ++i)
             m_posZOrderList->at(i)->setStackingParent(stackingParent);
     }
 
     if (m_negZOrderList) {
         for (size_t i = 0; i < m_negZOrderList->size(); ++i)
             m_negZOrderList->at(i)->setStackingParent(stackingParent);
     }
 }
 
-void DeprecatedPaintLayerStackingNode::updateStackingParentForNormalFlowList(DeprecatedPaintLayerStackingNode* stackingParent)
-{
-    if (m_normalFlowList) {
-        for (size_t i = 0; i < m_normalFlowList->size(); ++i)
-            m_normalFlowList->at(i)->setStackingParent(stackingParent);
-    }
-}
 #endif
 
 void DeprecatedPaintLayerStackingNode::updateLayerListsIfNeeded()
 {
     updateZOrderLists();
-    updateNormalFlowList();
 
     if (!layer()->reflectionInfo())
         return;
 
     DeprecatedPaintLayer* reflectionLayer = layer()->reflectionInfo()->reflectionLayer();
     reflectionLayer->stackingNode()->updateZOrderLists();
-    reflectionLayer->stackingNode()->updateNormalFlowList();
 }
 
 void DeprecatedPaintLayerStackingNode::updateStackingNodesAfterStyleChange(const ComputedStyle* oldStyle)
 {
     bool wasStackingContext = oldStyle ? !oldStyle->hasAutoZIndex() : false;
     int oldZIndex = oldStyle ? oldStyle->zIndex() : 0;
 
     bool isStackingContext = this->isStackingContext();
     if (isStackingContext == wasStackingContext && oldZIndex == zIndex())
         return;
 
     dirtyStackingContextZOrderLists();
 
     if (isStackingContext)
         dirtyZOrderLists();
     else
         clearZOrderLists();
 }
 
 void DeprecatedPaintLayerStackingNode::updateIsTreatedAsStackingContextForPainting()
 {
     bool isTreatedAsStackingContextForPainting = shouldBeTreatedAsStackingContextForPainting();
     if (isTreatedAsStackingContextForPainting == this->isTreatedAsStackingContextForPainting())
         return;
 
     m_isTreatedAsStackingContextForPainting = isTreatedAsStackingContextForPainting;
-    if (DeprecatedPaintLayer* p = layer()->parent())
-        p->stackingNode()->dirtyNormalFlowList();
+    if (!layoutObject()->documentBeingDestroyed() && !layer()->isRootLayer())
+        compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
     dirtyStackingContextZOrderLists();
 }
 
 DeprecatedPaintLayerStackingNode* DeprecatedPaintLayerStackingNode::ancestorStackingContextNode() const
 {
     for (DeprecatedPaintLayer* ancestor = layer()->parent(); ancestor; ancestor = ancestor->parent()) {
         DeprecatedPaintLayerStackingNode* stackingNode = ancestor->stackingNode();
         if (stackingNode->isStackingContext())
             return stackingNode;
     }
     return 0;
 }
 
 LayoutBoxModelObject* DeprecatedPaintLayerStackingNode::layoutObject() const
 {
     return m_layer->layoutObject();
 }
 
 } // namespace blink