Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 819248 - avoid adding null Layers into the output of SortLayersBy3DZOrder - r=mattwoodrow

Browse Source
This commit is contained in:
Benoit Jacob 2012-12-17 16:12:55 -05:00
parent ca3f4c5e2b
commit 743c19d5f0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/layers/LayerSorter.cpp
View File

@ -8,6 +8,7 @@
#include "limits.h"
#include "gfxLineSegment.h"
#include "Layers.h"
#include "mozilla/Assertions.h"
namespace mozilla {
namespace layers {
@ -278,6 +279,7 @@ void SortLayersBy3DZOrder(nsTArray<Layer*>& aLayers)
uint32_t last = noIncoming.Length() - 1;
Layer* layer = noIncoming.ElementAt(last);
MOZ_ASSERT(layer); // don't let null layer pointers sneak into sortedList
noIncoming.RemoveElementAt(last);
sortedList.AppendElement(layer);
@ -311,9 +313,11 @@ void SortLayersBy3DZOrder(nsTArray<Layer*>& aLayers)
}
}
// Remove all of them!
graph.RemoveEdgesTo(minNode);
noIncoming.AppendElement(minNode);
if (minNode) {
// Remove all of them!
graph.RemoveEdgesTo(minNode);
noIncoming.AppendElement(minNode);
}
}
} while (!noIncoming.IsEmpty());
NS_ASSERTION(!graph.GetEdgeCount(), "Cycles detected!");