Compute the normal flow list on the fly

Source/core/paint/DeprecatedPaintLayerStackingNode.h

 /*
  * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. 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>
@@ skipping 62 matching lines @@
 
     bool zOrderListsDirty() const { return m_zOrderListsDirty; }
     void dirtyZOrderLists();
     void updateZOrderLists();
     void clearZOrderLists();
     void dirtyStackingContextZOrderLists();
 
     bool hasPositiveZOrderList() const { return posZOrderList() && posZOrderList()->size(); }
     bool hasNegativeZOrderList() const { return negZOrderList() && negZOrderList()->size(); }
 
-    // FIXME: should check for dirtiness here?
-    bool isNormalFlowOnly() const { return !isTreatedAsStackingContextForPainting(); }
     bool isTreatedAsStackingContextForPainting() const { return m_isTreatedAsStackingContextForPainting; }
     void updateIsTreatedAsStackingContextForPainting();
-    bool normalFlowListDirty() const { return m_normalFlowListDirty; }
-    void dirtyNormalFlowList();
 
     void updateStackingNodesAfterStyleChange(const ComputedStyle* oldStyle);
 
     DeprecatedPaintLayerStackingNode* ancestorStackingContextNode() const;
 
     // FIXME: A lot of code depends on this function but shouldn't. We should
     // build our code on top of LayoutBoxModelObject, not DeprecatedPaintLayer.
     DeprecatedPaintLayer* layer() const;
 
 #if ENABLE(ASSERT)
     bool layerListMutationAllowed() const { return m_layerListMutationAllowed; }
     void setLayerListMutationAllowed(bool flag) { m_layerListMutationAllowed = flag; }
 #endif
 
 private:
     friend class DeprecatedPaintLayerStackingNodeIterator;
     friend class DeprecatedPaintLayerStackingNodeReverseIterator;
     friend class LayoutTreeAsText;
 
     Vector<DeprecatedPaintLayerStackingNode*>* posZOrderList() const
     {
         ASSERT(!m_zOrderListsDirty);
         ASSERT(isStackingContext() || !m_posZOrderList);
         return m_posZOrderList.get();
     }
 
-    Vector<DeprecatedPaintLayerStackingNode*>* normalFlowList() const
-    {
-        ASSERT(!m_normalFlowListDirty);
-        return m_normalFlowList.get();
-    }
-
     Vector<DeprecatedPaintLayerStackingNode*>* negZOrderList() const
     {
         ASSERT(!m_zOrderListsDirty);
         ASSERT(isStackingContext() || !m_negZOrderList);
         return m_negZOrderList.get();
     }
 
     void rebuildZOrderLists();
 
 #if ENABLE(ASSERT)
     bool isInStackingParentZOrderLists() const;
-    bool isInStackingParentNormalFlowList() const;
     void updateStackingParentForZOrderLists(DeprecatedPaintLayerStackingNode* stackingParent);
-    void updateStackingParentForNormalFlowList(DeprecatedPaintLayerStackingNode* stackingParent);
     void setStackingParent(DeprecatedPaintLayerStackingNode* stackingParent) { m_stackingParent = stackingParent; }
 #endif
 
     bool shouldBeTreatedAsStackingContextForPainting() const { return layoutObject().style()->isTreatedAsStackingContextForPainting(); }
 
-    void updateNormalFlowList();
-
     bool isDirtyStackingContext() const { return m_zOrderListsDirty && isStackingContext(); }
 
     DeprecatedPaintLayerCompositor* compositor() const;
     // We can't return a LayoutBox as LayoutInline can be a stacking context.
     LayoutBoxModelObject& layoutObject() const { return m_layoutObject; }
 
     LayoutBoxModelObject& m_layoutObject;
 
     // m_posZOrderList holds a sorted list of all the descendant nodes within
     // that have z-indices of 0 or greater (auto will count as 0).
     // m_negZOrderList holds descendants within our stacking context with
     // negative z-indices.
     OwnPtr<Vector<DeprecatedPaintLayerStackingNode*>> m_posZOrderList;
     OwnPtr<Vector<DeprecatedPaintLayerStackingNode*>> m_negZOrderList;
 
-    // This list contains child nodes that cannot create stacking contexts.
-    OwnPtr<Vector<DeprecatedPaintLayerStackingNode*>> m_normalFlowList;
-
     unsigned m_zOrderListsDirty : 1;
-    unsigned m_normalFlowListDirty: 1;
     unsigned m_isTreatedAsStackingContextForPainting : 1;
 
 #if ENABLE(ASSERT)
     unsigned m_layerListMutationAllowed : 1;
     DeprecatedPaintLayerStackingNode* m_stackingParent;
 #endif
 };
 
 inline void DeprecatedPaintLayerStackingNode::clearZOrderLists()
 {
@@ skipping 38 matching lines @@
 
 private:
     DeprecatedPaintLayerStackingNode* m_stackingNode;
     bool m_previousMutationAllowedState;
 };
 #endif
 
 } // namespace blink
 
 #endif // DeprecatedPaintLayerStackingNode_h