Restore sanity to RenderLayerStackingNode::shouldBeNormalFlowOnly

Source/core/rendering/RenderLayerStackingNode.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 67 matching lines @@
 
     bool hasPositiveZOrderList() const { return posZOrderList() && posZOrderList()->size(); }
     bool hasNegativeZOrderList() const { return negZOrderList() && negZOrderList()->size(); }
 
     // FIXME: should check for dirtiness here?
     bool isNormalFlowOnly() const { return m_isNormalFlowOnly; }
     void updateIsNormalFlowOnly();
     bool normalFlowListDirty() const { return m_normalFlowListDirty; }
     void dirtyNormalFlowList();
 
-    enum PaintOrderListType {BeforePromote, AfterPromote};
-    void computePaintOrderList(PaintOrderListType, Vector<RefPtr<Node> >&);
-
     void updateStackingNodesAfterStyleChange(const RenderStyle* oldStyle);
 
     RenderLayerStackingNode* ancestorStackingContextNode() const;
-    RenderLayerStackingNode* ancestorStackingNode() const;
 
     // Gets the enclosing stacking context for this node, possibly the node
     // itself, if it is a stacking context.
     RenderLayerStackingNode* enclosingStackingContextNode() { return isStackingContext() ? this : ancestorStackingContextNode(); }
 
     RenderLayer* layer() const { return m_layer; }
 
 #if !ASSERT_DISABLED
     bool layerListMutationAllowed() const { return m_layerListMutationAllowed; }
     void setLayerListMutationAllowed(bool flag) { m_layerListMutationAllowed = flag; }
@@ skipping 40 matching lines @@
     void updateNormalFlowList();
 
     bool isDirtyStackingContext() const { return m_zOrderListsDirty && isStackingContext(); }
 
     RenderLayerCompositor* compositor() const;
     // FIXME: Investigate changing this to Renderbox.
     RenderLayerModelObject* renderer() const;
 
     RenderLayer* m_layer;
 
-    // For stacking contexts, m_posZOrderList holds a sorted list of all the
-    // descendant nodes within the stacking context 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.
+    // 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<RenderLayerStackingNode*> > m_posZOrderList;
     OwnPtr<Vector<RenderLayerStackingNode*> > m_negZOrderList;
 
-    // This list contains child nodes that cannot create stacking contexts. For now it is just
-    // overflow layers, but that may change in the future.
+    // This list contains child nodes that cannot create stacking contexts.
     OwnPtr<Vector<RenderLayerStackingNode*> > m_normalFlowList;
 
-    // If this is true, then no non-descendant appears between any of our
-    // descendants in stacking order. This is one of the requirements of being
-    // able to safely become a stacking context.
-    unsigned m_descendantsAreContiguousInStackingOrder : 1;
-    unsigned m_descendantsAreContiguousInStackingOrderDirty : 1;
-
     unsigned m_zOrderListsDirty : 1;
     unsigned m_normalFlowListDirty: 1;
     unsigned m_isNormalFlowOnly : 1;
 
 #if !ASSERT_DISABLED
     unsigned m_layerListMutationAllowed : 1;
     RenderLayerStackingNode* m_stackingParent;
 #endif
 };
 
@@ skipping 40 matching lines @@
 
 private:
     RenderLayerStackingNode* m_stackingNode;
     bool m_previousMutationAllowedState;
 };
 #endif
 
 } // namespace WebCore
 
 #endif // RenderLayerStackingNode_h