corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 838688 - Optimize CollectFloats by doing an early return if this block doesn't have any floats. r=bzbarsky

Browse Source
This commit is contained in:
Mats Palmgren
2013-02-28 00:05:45 +01:00
parent 69c777f14a
commit 6b76097b34
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
layout/generic/nsBlockFrame.cpp
View File

@@ -6895,8 +6895,8 @@ nsBlockFrame::ReflowBullet(nsIFrame* aBulletFrame,
// that are float containing blocks. Floats that or not children of 'this'
// are ignored (they are not added to aList).
void
nsBlockFrame::CollectFloats(nsIFrame* aFrame, nsFrameList& aList,
bool aCollectSiblings)
nsBlockFrame::DoCollectFloats(nsIFrame* aFrame, nsFrameList& aList,
bool aCollectSiblings)
{
while (aFrame) {
// Don't descend into float containing blocks.
@@ -6934,8 +6934,8 @@ nsBlockFrame::CollectFloats(nsIFrame* aFrame, nsFrameList& aList,
// XXXmats nsInlineFrame's lazy reparenting depends on NOT doing that.
}
CollectFloats(aFrame->GetFirstPrincipalChild(), aList, true);
CollectFloats(aFrame->GetFirstChild(kOverflowList), aList, true);
DoCollectFloats(aFrame->GetFirstPrincipalChild(), aList, true);
DoCollectFloats(aFrame->GetFirstChild(kOverflowList), aList, true);
}
if (!aCollectSiblings)
break;