wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Timothy Nikkel 2012-02-28 23:53:37 -06:00
parent 2cbb11efb8
commit 80ae2df9e6
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
layout/generic/nsSubDocumentFrame.cpp
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,42 +378,39 @@ nsSubDocumentFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
} }
} }
if (NS_SUCCEEDED(rv)) { bool addedLayer = false;
bool addedLayer = false; if (subdocRootFrame && parentAPD != subdocAPD) {
NS_WARN_IF_FALSE(!addedLayer,
"Two container layers have been added. "
"Performance may suffer.");
addedLayer = true;
if (subdocRootFrame && parentAPD != subdocAPD) { nsDisplayZoom* zoomItem =
NS_WARN_IF_FALSE(!addedLayer, new (aBuilder) nsDisplayZoom(aBuilder, subdocRootFrame, &childItems,
"Two container layers have been added. " subdocAPD, parentAPD);
"Performance may suffer."); childItems.AppendToTop(zoomItem);
addedLayer = true; }
nsDisplayZoom* zoomItem = if (!addedLayer && presContext->IsRootContentDocument()) {
new (aBuilder) nsDisplayZoom(aBuilder, subdocRootFrame, &childItems, // We always want top level content documents to be in their own layer.
subdocAPD, parentAPD); nsDisplayOwnLayer* layerItem = new (aBuilder) nsDisplayOwnLayer(
childItems.AppendToTop(zoomItem); aBuilder, subdocRootFrame ? subdocRootFrame : this, &childItems);
} childItems.AppendToTop(layerItem);
}
if (!addedLayer && presContext->IsRootContentDocument()) {
// We always want top level content documents to be in their own layer.
nsDisplayOwnLayer* layerItem = new (aBuilder) nsDisplayOwnLayer(
aBuilder, subdocRootFrame ? subdocRootFrame : this, &childItems);
childItems.AppendToTop(layerItem);
}
if (ShouldClipSubdocument()) { if (ShouldClipSubdocument()) {
nsDisplayClip* item = nsDisplayClip* item =
new (aBuilder) nsDisplayClip(aBuilder, this, &childItems, new (aBuilder) nsDisplayClip(aBuilder, this, &childItems,
subdocBoundsInParentUnits); subdocBoundsInParentUnits);
// Clip children to the child root frame's rectangle // Clip children to the child root frame's rectangle
childItems.AppendToTop(item); childItems.AppendToTop(item);
} }
if (mIsInline) { if (mIsInline) {
WrapReplacedContentForBorderRadius(aBuilder, &childItems, aLists); WrapReplacedContentForBorderRadius(aBuilder, &childItems, aLists);
} else { } else {
aLists.Content()->AppendToTop(&childItems); aLists.Content()->AppendToTop(&childItems);
}
} }
// delete childItems in case of OOM // delete childItems in case of OOM