Remove negative z-index.

sky/engine/core/rendering/RenderLayerStackingNode.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. 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>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 78 matching lines @@
 
 void RenderLayerStackingNode::dirtyZOrderLists()
 {
     ASSERT(m_layerListMutationAllowed);
     ASSERT(isStackingContext());
 
 #if ENABLE(ASSERT)
     updateStackingParentForZOrderLists(0);
 #endif
 
-    if (m_posZOrderList)
-        m_posZOrderList->clear();
-    if (m_negZOrderList)
-        m_negZOrderList->clear();
+    if (m_zOrderList)
+        m_zOrderList->clear();
     m_zOrderListsDirty = true;
 }
 
 void RenderLayerStackingNode::dirtyStackingContextZOrderLists()
 {
     if (RenderLayerStackingNode* stackingNode = ancestorStackingContextNode())
         stackingNode->dirtyZOrderLists();
 }
 
 void RenderLayerStackingNode::dirtyNormalFlowList()
 {
     ASSERT(m_layerListMutationAllowed);
 
 #if ENABLE(ASSERT)
     updateStackingParentForNormalFlowList(0);
 #endif
 
     if (m_normalFlowList)
         m_normalFlowList->clear();
     m_normalFlowListDirty = true;
 }
 
 void RenderLayerStackingNode::rebuildZOrderLists()
 {
     ASSERT(m_layerListMutationAllowed);
     ASSERT(isDirtyStackingContext());
 
     for (RenderLayer* child = layer()->firstChild(); child; child = child->nextSibling())
-        child->stackingNode()->collectLayers(m_posZOrderList, m_negZOrderList);
+        child->stackingNode()->collectLayers(m_zOrderList);
 
-    // Sort the two lists.
-    if (m_posZOrderList)
-        std::stable_sort(m_posZOrderList->begin(), m_posZOrderList->end(), compareZIndex);
-
-    if (m_negZOrderList)
-        std::stable_sort(m_negZOrderList->begin(), m_negZOrderList->end(), compareZIndex);
+    if (m_zOrderList)
+        std::stable_sort(m_zOrderList->begin(), m_zOrderList->end(), compareZIndex);
 
 #if ENABLE(ASSERT)
     updateStackingParentForZOrderLists(this);
 #endif
 
     m_zOrderListsDirty = false;
 }
 
 void RenderLayerStackingNode::updateNormalFlowList()
 {
@@ skipping 10 matching lines @@
         }
     }
 
 #if ENABLE(ASSERT)
     updateStackingParentForNormalFlowList(this);
 #endif
 
     m_normalFlowListDirty = false;
 }
 
-void RenderLayerStackingNode::collectLayers(OwnPtr<Vector<RenderLayerStackingNode*> >& posBuffer, OwnPtr<Vector<RenderLayerStackingNode*> >& negBuffer)
+void RenderLayerStackingNode::collectLayers(OwnPtr<Vector<RenderLayerStackingNode*> >& buffer)
 {
     if (!isNormalFlowOnly()) {
-        OwnPtr<Vector<RenderLayerStackingNode*> >& buffer = (zIndex() >= 0) ? posBuffer : negBuffer;
         if (!buffer)
             buffer = adoptPtr(new Vector<RenderLayerStackingNode*>);
         buffer->append(this);
     }
 
     if (!isStackingContext()) {
         for (RenderLayer* child = layer()->firstChild(); child; child = child->nextSibling())
-            child->stackingNode()->collectLayers(posBuffer, negBuffer);
+            child->stackingNode()->collectLayers(buffer);
     }
 }
 
 #if ENABLE(ASSERT)
 bool RenderLayerStackingNode::isInStackingParentZOrderLists() const
 {
     if (!m_stackingParent || m_stackingParent->zOrderListsDirty())
         return false;
 
-    if (m_stackingParent->posZOrderList() && m_stackingParent->posZOrderList()->find(this) != kNotFound)
-        return true;
-
-    if (m_stackingParent->negZOrderList() && m_stackingParent->negZOrderList()->find(this) != kNotFound)
+    if (m_stackingParent->zOrderList() && m_stackingParent->zOrderList()->find(this) != kNotFound)
         return true;
 
     return false;
 }
 
 bool RenderLayerStackingNode::isInStackingParentNormalFlowList() const
 {
     if (!m_stackingParent || m_stackingParent->normalFlowListDirty())
         return false;
 
     return (m_stackingParent->normalFlowList() && m_stackingParent->normalFlowList()->find(this) != kNotFound);
 }
 
 void RenderLayerStackingNode::updateStackingParentForZOrderLists(RenderLayerStackingNode* stackingParent)
 {
-    if (m_posZOrderList) {
-        for (size_t i = 0; i < m_posZOrderList->size(); ++i)
-            m_posZOrderList->at(i)->setStackingParent(stackingParent);
-    }
-
-    if (m_negZOrderList) {
-        for (size_t i = 0; i < m_negZOrderList->size(); ++i)
-            m_negZOrderList->at(i)->setStackingParent(stackingParent);
+    if (m_zOrderList) {
+        for (size_t i = 0; i < m_zOrderList->size(); ++i)
+            m_zOrderList->at(i)->setStackingParent(stackingParent);
     }
 }
 
 void RenderLayerStackingNode::updateStackingParentForNormalFlowList(RenderLayerStackingNode* stackingParent)
 {
     if (m_normalFlowList) {
         for (size_t i = 0; i < m_normalFlowList->size(); ++i)
             m_normalFlowList->at(i)->setStackingParent(stackingParent);
     }
 }
 #endif
 
 void RenderLayerStackingNode::updateLayerListsIfNeeded()
 {
     updateZOrderLists();
     updateNormalFlowList();
 }
 
 void RenderLayerStackingNode::updateStackingNodesAfterStyleChange(const RenderStyle* oldStyle)
 {
     bool wasStackingContext = oldStyle ? !oldStyle->hasAutoZIndex() : false;
-    int oldZIndex = oldStyle ? oldStyle->zIndex() : 0;
+    unsigned oldZIndex = oldStyle ? oldStyle->zIndex() : 0;
 
     bool isStackingContext = this->isStackingContext();
     if (isStackingContext == wasStackingContext && oldZIndex == zIndex())
         return;
 
     dirtyStackingContextZOrderLists();
 
     if (isStackingContext)
         dirtyZOrderLists();
     else
@@ skipping 28 matching lines @@
     }
     return 0;
 }
 
 RenderLayerModelObject* RenderLayerStackingNode::renderer() const
 {
     return m_layer->renderer();
 }
 
 } // namespace blink