Bug 714346. Part 1. Make some code stop checking useless return values because it makes the control flow more complicated then needed. r=mats

This commit is contained in:
Timothy Nikkel 2012-02-28 23:53:37 -06:00
parent 2cbb11efb8
commit 80ae2df9e6

View File

@ -343,7 +343,7 @@ nsSubDocumentFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
nsRect subdocBoundsInParentUnits = nsRect subdocBoundsInParentUnits =
mInnerView->GetBounds() + GetOffsetToCrossDoc(aBuilder->ReferenceFrame()); mInnerView->GetBounds() + GetOffsetToCrossDoc(aBuilder->ReferenceFrame());
if (subdocRootFrame && NS_SUCCEEDED(rv)) { if (subdocRootFrame) {
rv = subdocRootFrame-> rv = subdocRootFrame->
BuildDisplayListForStackingContext(aBuilder, dirty, &childItems); BuildDisplayListForStackingContext(aBuilder, dirty, &childItems);
} }
@ -378,8 +378,6 @@ nsSubDocumentFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
} }
} }
if (NS_SUCCEEDED(rv)) {
bool addedLayer = false; bool addedLayer = false;
if (subdocRootFrame && parentAPD != subdocAPD) { if (subdocRootFrame && parentAPD != subdocAPD) {
@ -414,7 +412,6 @@ nsSubDocumentFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
} else { } else {
aLists.Content()->AppendToTop(&childItems); aLists.Content()->AppendToTop(&childItems);
} }
}
// delete childItems in case of OOM // delete childItems in case of OOM
childItems.DeleteAll(); childItems.DeleteAll();