DeprecatedPaintLayerStackingNode should walk DPL

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 71 matching lines @@
 // To implement any z-order list iterations, use
 // DeprecatedPaintLayerStackingNodeIterator and
 // DeprecatedPaintLayerStackingNodeReverseIterator.
 //
 // This class is NOT DEPRECATED, DeprecatedPaintLayer is and we match its
 // naming.
 class CORE_EXPORT DeprecatedPaintLayerStackingNode {
     WTF_MAKE_FAST_ALLOCATED(DeprecatedPaintLayerStackingNode);
     WTF_MAKE_NONCOPYABLE(DeprecatedPaintLayerStackingNode);
 public:
-    explicit DeprecatedPaintLayerStackingNode(LayoutBoxModelObject&);
+    explicit DeprecatedPaintLayerStackingNode(DeprecatedPaintLayer*);
     ~DeprecatedPaintLayerStackingNode();
 
-    int zIndex() const { return layoutObject().style()->zIndex(); }
+    int zIndex() const { return layoutObject()->style()->zIndex(); }
 
-    bool isStackingContext() const { return layoutObject().style()->isStackingContext(); }
+    bool isStackingContext() const { return layoutObject()->style()->isStackingContext(); }
 
     // Update our normal and z-index lists.
     void updateLayerListsIfNeeded();
 
     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(); }
 
     bool isTreatedAsOrStackingContext() const { return m_isTreatedAsOrStackingContext; }
     void updateIsTreatedAsStackingContext();
 
     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;
+    DeprecatedPaintLayer* layer() const { return m_layer; }
 
 #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*>* negZOrderList() const
     {
         ASSERT(!m_zOrderListsDirty);
         ASSERT(isStackingContext() || !m_negZOrderList);
         return m_negZOrderList.get();
     }
 
     void rebuildZOrderLists();
+    void collectLayers(OwnPtr<Vector<DeprecatedPaintLayerStackingNode*>>& posZOrderList, OwnPtr<Vector<DeprecatedPaintLayerStackingNode*>>& negZOrderList);
 
 #if ENABLE(ASSERT)
     bool isInStackingParentZOrderLists() const;
     void updateStackingParentForZOrderLists(DeprecatedPaintLayerStackingNode* stackingParent);
     void setStackingParent(DeprecatedPaintLayerStackingNode* stackingParent) { m_stackingParent = stackingParent; }
 #endif
 
-    bool shouldBeTreatedAsOrStackingContext() const { return layoutObject().style()->isTreatedAsOrStackingContext(); }
+    bool shouldBeTreatedAsOrStackingContext() const { return layoutObject()->style()->isTreatedAsOrStackingContext(); }
 
     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* layoutObject() const;
 
-    LayoutBoxModelObject& m_layoutObject;
+    DeprecatedPaintLayer* m_layer;
 
     // 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 boolean caches whether the z-order lists above are dirty.
     // It is only ever set for stacking contexts, as no other element can
@@ skipping 55 matching lines @@
 
 private:
     DeprecatedPaintLayerStackingNode* m_stackingNode;
     bool m_previousMutationAllowedState;
 };
 #endif
 
 } // namespace blink
 
 #endif // DeprecatedPaintLayerStackingNode_h