Remove negative z-index.

sky/engine/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 43 matching lines @@
 
 class RenderLayer;
 class RenderStyle;
 
 class RenderLayerStackingNode {
     WTF_MAKE_NONCOPYABLE(RenderLayerStackingNode);
 public:
     explicit RenderLayerStackingNode(RenderLayer*);
     ~RenderLayerStackingNode();
 
-    int zIndex() const { return renderer()->style()->zIndex(); }
+    unsigned 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(); }
+    bool hasPositiveZOrderList() const { return zOrderList() && zOrderList()->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;
 
     // 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 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 RenderTreeAsText;
 
-    Vector<RenderLayerStackingNode*>* posZOrderList() const
+    Vector<RenderLayerStackingNode*>* zOrderList() const
     {
         ASSERT(!m_zOrderListsDirty);
-        ASSERT(isStackingContext() || !m_posZOrderList);
-        return m_posZOrderList.get();
+        ASSERT(isStackingContext() || !m_zOrderList);
+        return m_zOrderList.get();
     }
 
     Vector<RenderLayerStackingNode*>* normalFlowList() const
     {
         ASSERT(!m_normalFlowListDirty);
         return m_normalFlowList.get();
     }
 
-    Vector<RenderLayerStackingNode*>* 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<RenderLayerStackingNode*> >& zOrderList);
 
 #if ENABLE(ASSERT)
     bool isInStackingParentZOrderLists() const;
     bool isInStackingParentNormalFlowList() const;
     void updateStackingParentForZOrderLists(RenderLayerStackingNode* stackingParent);
     void updateStackingParentForNormalFlowList(RenderLayerStackingNode* stackingParent);
     void setStackingParent(RenderLayerStackingNode* stackingParent) { m_stackingParent = stackingParent; }
 #endif
 
     bool shouldBeNormalFlowOnly() const;
 
     void updateNormalFlowList();
 
     bool isDirtyStackingContext() const { return m_zOrderListsDirty && isStackingContext(); }
 
     // FIXME: Investigate changing this to Renderbox.
     RenderLayerModelObject* renderer() const;
 
     RenderLayer* m_layer;
 
-    // m_posZOrderList holds a sorted list of all the descendant nodes within
+    // m_zOrderList 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<RenderLayerStackingNode*> > m_zOrderList;
 
     // This list contains child nodes that cannot create stacking contexts.
     OwnPtr<Vector<RenderLayerStackingNode*> > m_normalFlowList;
 
     unsigned m_zOrderListsDirty : 1;
     unsigned m_normalFlowListDirty: 1;
     unsigned m_isNormalFlowOnly : 1;
 
 #if ENABLE(ASSERT)
     unsigned m_layerListMutationAllowed : 1;
     RenderLayerStackingNode* m_stackingParent;
 #endif
 };
 
 inline void RenderLayerStackingNode::clearZOrderLists()
 {
     ASSERT(!isStackingContext());
 
 #if ENABLE(ASSERT)
     updateStackingParentForZOrderLists(0);
 #endif
 
-    m_posZOrderList.clear();
-    m_negZOrderList.clear();
+    m_zOrderList.clear();
 }
 
 inline void RenderLayerStackingNode::updateZOrderLists()
 {
     if (!m_zOrderListsDirty)
         return;
 
     if (!isStackingContext()) {
         clearZOrderLists();
         m_zOrderListsDirty = false;
@@ skipping 20 matching lines @@
 
 private:
     RenderLayerStackingNode* m_stackingNode;
     bool m_previousMutationAllowedState;
 };
 #endif
 
 } // namespace blink
 
 #endif  // SKY_ENGINE_CORE_RENDERING_RENDERLAYERSTACKINGNODE_H_