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

Bug 815972: Remove unneeded nsDisplayListCollection from nsBlockFrame.cpp's DisplayLine() helper-function. r=roc

Browse Source
This commit is contained in:
Daniel Holbert 2012-11-28 00:08:30 -08:00
parent a5d2fb69c6
commit 200a4ad7d0
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
layout/generic/nsBlockFrame.cpp
View File

@ -6077,27 +6077,26 @@ DisplayLine(nsDisplayListBuilder* aBuilder, const nsRect& aLineArea,
!lineMayHaveTextOverflow) !lineMayHaveTextOverflow)
return NS_OK; return NS_OK;
nsDisplayListCollection collection;
nsresult rv;
// Block-level child backgrounds go on the blockBorderBackgrounds list ... // Block-level child backgrounds go on the blockBorderBackgrounds list ...
// Inline-level child backgrounds go on the regular child content list. // Inline-level child backgrounds go on the regular child content list.
nsDisplayListSet childLists(collection, nsDisplayListSet childLists(aLists,
lineInline ? collection.Content() : collection.BlockBorderBackgrounds()); lineInline ? aLists.Content() : aLists.BlockBorderBackgrounds());
uint32_t flags = lineInline ? nsIFrame::DISPLAY_CHILD_INLINE : 0;
nsIFrame* kid = aLine->mFirstChild; nsIFrame* kid = aLine->mFirstChild;
int32_t n = aLine->GetChildCount(); int32_t n = aLine->GetChildCount();
while (--n >= 0) { while (--n >= 0) {
rv = aFrame->BuildDisplayListForChild(aBuilder, kid, aDirtyRect, childLists, nsresult rv = aFrame->BuildDisplayListForChild(aBuilder, kid, aDirtyRect,
lineInline ? nsIFrame::DISPLAY_CHILD_INLINE : 0); childLists, flags);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
kid = kid->GetNextSibling(); kid = kid->GetNextSibling();
} }
if (lineMayHaveTextOverflow) { if (lineMayHaveTextOverflow) {
aTextOverflow->ProcessLine(collection, aLine.get()); aTextOverflow->ProcessLine(aLists, aLine.get());
} }
collection.MoveTo(aLists);
return NS_OK; return NS_OK;
} }