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

Unified Diff: sky/engine/core/rendering/RenderLayerStackingNodeIterator.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/RenderLayerStackingNodeIterator.cpp
diff --git a/sky/engine/core/rendering/RenderLayerStackingNodeIterator.cpp b/sky/engine/core/rendering/RenderLayerStackingNodeIterator.cpp
index 2c54cfcb992f5248cbb8f6171c12ab426bcabbfb..e4e7d3674185c1a4028d6dc834339749805cf16c 100644
--- a/sky/engine/core/rendering/RenderLayerStackingNodeIterator.cpp
+++ b/sky/engine/core/rendering/RenderLayerStackingNodeIterator.cpp
@@ -38,15 +38,6 @@ namespace blink {
RenderLayerStackingNode* RenderLayerStackingNodeIterator::next()
{
- if (m_remainingChildren & NegativeZOrderChildren) {
- Vector<RenderLayerStackingNode*>* negZOrderList = m_root.negZOrderList();
- if (negZOrderList && m_index < negZOrderList->size())
- return negZOrderList->at(m_index++);
-
- m_index = 0;
- m_remainingChildren &= ~NegativeZOrderChildren;
- }
-
if (m_remainingChildren & NormalFlowChildren) {
Vector<RenderLayerStackingNode*>* normalFlowList = m_root.normalFlowList();
if (normalFlowList && m_index < normalFlowList->size())
@@ -57,9 +48,9 @@ RenderLayerStackingNode* RenderLayerStackingNodeIterator::next()
}
if (m_remainingChildren & PositiveZOrderChildren) {
- Vector<RenderLayerStackingNode*>* posZOrderList = m_root.posZOrderList();
- if (posZOrderList && m_index < posZOrderList->size())
- return posZOrderList->at(m_index++);
+ Vector<RenderLayerStackingNode*>* zOrderList = m_root.zOrderList();
+ if (zOrderList && m_index < zOrderList->size())
+ return zOrderList->at(m_index++);
m_index = 0;
m_remainingChildren &= ~PositiveZOrderChildren;
@@ -70,15 +61,6 @@ RenderLayerStackingNode* RenderLayerStackingNodeIterator::next()
RenderLayerStackingNode* RenderLayerStackingNodeReverseIterator::next()
{
- if (m_remainingChildren & NegativeZOrderChildren) {
- Vector<RenderLayerStackingNode*>* negZOrderList = m_root.negZOrderList();
- if (negZOrderList && m_index >= 0)
- return negZOrderList->at(m_index--);
-
- m_remainingChildren &= ~NegativeZOrderChildren;
- setIndexToLastItem();
- }
-
if (m_remainingChildren & NormalFlowChildren) {
Vector<RenderLayerStackingNode*>* normalFlowList = m_root.normalFlowList();
if (normalFlowList && m_index >= 0)
@@ -89,9 +71,9 @@ RenderLayerStackingNode* RenderLayerStackingNodeReverseIterator::next()
}
if (m_remainingChildren & PositiveZOrderChildren) {
- Vector<RenderLayerStackingNode*>* posZOrderList = m_root.posZOrderList();
- if (posZOrderList && m_index >= 0)
- return posZOrderList->at(m_index--);
+ Vector<RenderLayerStackingNode*>* zOrderList = m_root.zOrderList();
+ if (zOrderList && m_index >= 0)
+ return zOrderList->at(m_index--);
m_remainingChildren &= ~PositiveZOrderChildren;
setIndexToLastItem();
@@ -102,16 +84,6 @@ RenderLayerStackingNode* RenderLayerStackingNodeReverseIterator::next()
void RenderLayerStackingNodeReverseIterator::setIndexToLastItem()
{
- if (m_remainingChildren & NegativeZOrderChildren) {
- Vector<RenderLayerStackingNode*>* negZOrderList = m_root.negZOrderList();
- if (negZOrderList) {
- m_index = negZOrderList->size() - 1;
- return;
- }
-
- m_remainingChildren &= ~NegativeZOrderChildren;
- }
-
if (m_remainingChildren & NormalFlowChildren) {
Vector<RenderLayerStackingNode*>* normalFlowList = m_root.normalFlowList();
if (normalFlowList) {
@@ -123,9 +95,9 @@ void RenderLayerStackingNodeReverseIterator::setIndexToLastItem()
}
if (m_remainingChildren & PositiveZOrderChildren) {
- Vector<RenderLayerStackingNode*>* posZOrderList = m_root.posZOrderList();
- if (posZOrderList) {
- m_index = posZOrderList->size() - 1;
+ Vector<RenderLayerStackingNode*>* zOrderList = m_root.zOrderList();
+ if (zOrderList) {
+ m_index = zOrderList->size() - 1;
return;
}
« no previous file with comments | « sky/engine/core/rendering/RenderLayerStackingNodeIterator.h ('k') | sky/engine/core/rendering/RenderTreeAsText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698