Bug 691431 - Remove invalid assertion and NULL check childFrame in WrapPreserve3DList. r=roc

This commit is contained in:
Matt Woodrow 2011-10-04 14:23:04 +13:00
Родитель 1d5fd8ff91
Коммит 8abd263d40
1 изменённых файлов: 1 добавлений и 2 удалений

Просмотреть файл

@ -1529,13 +1529,12 @@ WrapPreserve3DListInternal(nsIFrame* aFrame, nsDisplayListBuilder *aBuilder, nsD
nsDisplayList temp;
while (nsDisplayItem *item = aList->RemoveBottom()) {
nsIFrame *childFrame = item->GetUnderlyingFrame();
NS_ASSERTION(childFrame, "All display items to be wrapped must have a frame!");
// We accumulate sequential items that aren't transforms into the 'temp' list
// and then flush this list into newList by wrapping the whole lot with a single
// nsDisplayTransform.
if (childFrame->GetParent()->Preserves3DChildren()) {
if (childFrame && childFrame->GetParent()->Preserves3DChildren()) {
switch (item->GetType()) {
case nsDisplayItem::TYPE_TRANSFORM: {
if (!temp.IsEmpty()) {