Move rendering/RenderLayer* to layout/

Source/core/layout/LayerStackingNode.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 24 matching lines @@
  * applicable instead of those above.  If you wish to allow use of your
  * version of this file only under the terms of one of those two
  * licenses (the MPL or the GPL) and not to allow others to use your
  * version of this file under the LGPL, indicate your decision by
  * deletingthe provisions above and replace them with the notice and
  * other provisions required by the MPL or the GPL, as the case may be.
  * If you do not delete the provisions above, a recipient may use your
  * version of this file under any of the LGPL, the MPL or the GPL.
  */
 
-#ifndef RenderLayerStackingNode_h
-#define RenderLayerStackingNode_h
+#ifndef LayerStackingNode_h
+#define LayerStackingNode_h
 
-#include "core/rendering/RenderLayerModelObject.h"
+#include "core/layout/LayoutLayerModelObject.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
-class RenderLayer;
-class RenderLayerCompositor;
+class Layer;
+class LayerCompositor;
 class RenderStyle;
 
-class RenderLayerStackingNode {
-    WTF_MAKE_NONCOPYABLE(RenderLayerStackingNode);
+class LayerStackingNode {
+    WTF_MAKE_NONCOPYABLE(LayerStackingNode);
 public:
-    explicit RenderLayerStackingNode(RenderLayer*);
-    ~RenderLayerStackingNode();
+    explicit LayerStackingNode(Layer*);
+    ~LayerStackingNode();
 
     int zIndex() const { return renderer()->style()->zIndex(); }
 
     // A stacking context is a layer that has a non-auto z-index.
     bool isStackingContext() const { return !renderer()->style()->hasAutoZIndex(); }
 
     // 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(); }
 
     // FIXME: should check for dirtiness here?
     bool isNormalFlowOnly() const { return m_isNormalFlowOnly; }
     void updateIsNormalFlowOnly();
     bool normalFlowListDirty() const { return m_normalFlowListDirty; }
     void dirtyNormalFlowList();
 
     void updateStackingNodesAfterStyleChange(const RenderStyle* oldStyle);
 
-    RenderLayerStackingNode* ancestorStackingContextNode() const;
+    LayerStackingNode* ancestorStackingContextNode() const;
 
-    RenderLayer* layer() const { return m_layer; }
+    Layer* 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 RenderLayerStackingNodeIterator;
-    friend class RenderLayerStackingNodeReverseIterator;
+    friend class LayerStackingNodeIterator;
+    friend class LayerStackingNodeReverseIterator;
     friend class LayoutTreeAsText;
 
-    Vector<RenderLayerStackingNode*>* posZOrderList() const
+    Vector<LayerStackingNode*>* posZOrderList() const
     {
         ASSERT(!m_zOrderListsDirty);
         ASSERT(isStackingContext() || !m_posZOrderList);
         return m_posZOrderList.get();
     }
 
-    Vector<RenderLayerStackingNode*>* normalFlowList() const
+    Vector<LayerStackingNode*>* normalFlowList() const
     {
         ASSERT(!m_normalFlowListDirty);
         return m_normalFlowList.get();
     }
 
-    Vector<RenderLayerStackingNode*>* negZOrderList() const
+    Vector<LayerStackingNode*>* negZOrderList() const
     {
         ASSERT(!m_zOrderListsDirty);
         ASSERT(isStackingContext() || !m_negZOrderList);
         return m_negZOrderList.get();
     }
 
     void rebuildZOrderLists();
-    void collectLayers(OwnPtr<Vector<RenderLayerStackingNode*> >& posZOrderList, OwnPtr<Vector<RenderLayerStackingNode*> >& negZOrderList);
+    void collectLayers(OwnPtr<Vector<LayerStackingNode*>>& posZOrderList, OwnPtr<Vector<LayerStackingNode*>>& negZOrderList);
 
 #if ENABLE(ASSERT)
     bool isInStackingParentZOrderLists() const;
     bool isInStackingParentNormalFlowList() const;
-    void updateStackingParentForZOrderLists(RenderLayerStackingNode* stackingParent);
-    void updateStackingParentForNormalFlowList(RenderLayerStackingNode* stackingParent);
-    void setStackingParent(RenderLayerStackingNode* stackingParent) { m_stackingParent = stackingParent; }
+    void updateStackingParentForZOrderLists(LayerStackingNode* stackingParent);
+    void updateStackingParentForNormalFlowList(LayerStackingNode* stackingParent);
+    void setStackingParent(LayerStackingNode* stackingParent) { m_stackingParent = stackingParent; }
 #endif
 
     bool shouldBeNormalFlowOnly() const;
 
     void updateNormalFlowList();
 
     bool isDirtyStackingContext() const { return m_zOrderListsDirty && isStackingContext(); }
 
-    RenderLayerCompositor* compositor() const;
+    LayerCompositor* compositor() const;
     // FIXME: Investigate changing this to Renderbox.
-    RenderLayerModelObject* renderer() const;
+    LayoutLayerModelObject* renderer() const;
 
-    RenderLayer* m_layer;
+    Layer* 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<RenderLayerStackingNode*> > m_posZOrderList;
-    OwnPtr<Vector<RenderLayerStackingNode*> > m_negZOrderList;
+    OwnPtr<Vector<LayerStackingNode*>> m_posZOrderList;
+    OwnPtr<Vector<LayerStackingNode*>> m_negZOrderList;
 
     // This list contains child nodes that cannot create stacking contexts.
-    OwnPtr<Vector<RenderLayerStackingNode*> > m_normalFlowList;
+    OwnPtr<Vector<LayerStackingNode*>> m_normalFlowList;
 
     unsigned m_zOrderListsDirty : 1;
     unsigned m_normalFlowListDirty: 1;
     unsigned m_isNormalFlowOnly : 1;
 
 #if ENABLE(ASSERT)
     unsigned m_layerListMutationAllowed : 1;
-    RenderLayerStackingNode* m_stackingParent;
+    LayerStackingNode* m_stackingParent;
 #endif
 };
 
-inline void RenderLayerStackingNode::clearZOrderLists()
+inline void LayerStackingNode::clearZOrderLists()
 {
     ASSERT(!isStackingContext());
 
 #if ENABLE(ASSERT)
     updateStackingParentForZOrderLists(0);
 #endif
 
     m_posZOrderList.clear();
     m_negZOrderList.clear();
 }
 
-inline void RenderLayerStackingNode::updateZOrderLists()
+inline void LayerStackingNode::updateZOrderLists()
 {
     if (!m_zOrderListsDirty)
         return;
 
     if (!isStackingContext()) {
         clearZOrderLists();
         m_zOrderListsDirty = false;
         return;
     }
 
     rebuildZOrderLists();
 }
 
 #if ENABLE(ASSERT)
 class LayerListMutationDetector {
 public:
-    explicit LayerListMutationDetector(RenderLayerStackingNode* stackingNode)
+    explicit LayerListMutationDetector(LayerStackingNode* stackingNode)
         : m_stackingNode(stackingNode)
         , m_previousMutationAllowedState(stackingNode->layerListMutationAllowed())
     {
         m_stackingNode->setLayerListMutationAllowed(false);
     }
 
     ~LayerListMutationDetector()
     {
         m_stackingNode->setLayerListMutationAllowed(m_previousMutationAllowedState);
     }
 
 private:
-    RenderLayerStackingNode* m_stackingNode;
+    LayerStackingNode* m_stackingNode;
     bool m_previousMutationAllowedState;
 };
 #endif
 
 } // namespace blink
 
-#endif // RenderLayerStackingNode_h
+#endif // LayerStackingNode_h