Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Unified Diff: sky/engine/core/rendering/RenderLayerStackingNode.cpp

Issue 873983007: Remove negative z-index. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sky/engine/core/rendering/RenderLayerStackingNode.cpp
diff --git a/sky/engine/core/rendering/RenderLayerStackingNode.cpp b/sky/engine/core/rendering/RenderLayerStackingNode.cpp
index 45c4520964320c5067e806f4a293d280005c544a..aa77021df49b786110b500d89a0c6256b701a7e3 100644
--- a/sky/engine/core/rendering/RenderLayerStackingNode.cpp
+++ b/sky/engine/core/rendering/RenderLayerStackingNode.cpp
@@ -96,10 +96,8 @@ void RenderLayerStackingNode::dirtyZOrderLists()
updateStackingParentForZOrderLists(0);
#endif
- if (m_posZOrderList)
- m_posZOrderList->clear();
- if (m_negZOrderList)
- m_negZOrderList->clear();
+ if (m_zOrderList)
+ m_zOrderList->clear();
m_zOrderListsDirty = true;
}
@@ -128,14 +126,10 @@ void RenderLayerStackingNode::rebuildZOrderLists()
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);
@@ -166,10 +160,9 @@ void RenderLayerStackingNode::updateNormalFlowList()
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);
@@ -177,7 +170,7 @@ void RenderLayerStackingNode::collectLayers(OwnPtr<Vector<RenderLayerStackingNod
if (!isStackingContext()) {
for (RenderLayer* child = layer()->firstChild(); child; child = child->nextSibling())
- child->stackingNode()->collectLayers(posBuffer, negBuffer);
+ child->stackingNode()->collectLayers(buffer);
}
}
@@ -187,10 +180,7 @@ 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;
@@ -206,14 +196,9 @@ bool RenderLayerStackingNode::isInStackingParentNormalFlowList() const
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);
}
}
@@ -235,7 +220,7 @@ void RenderLayerStackingNode::updateLayerListsIfNeeded()
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())
« no previous file with comments | « sky/engine/core/rendering/RenderLayerStackingNode.h ('k') | sky/engine/core/rendering/RenderLayerStackingNodeIterator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698