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

Bug 865702. Don't move the frame in FinishReflowChild if we were told not to. r=roc

Browse Source
This commit is contained in:
Timothy Nikkel
2013-05-23 00:37:05 -05:00
parent b8afb5af86
commit 94241fa2bd
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
layout/generic/nsContainerFrame.cpp
View File

@@ -1049,9 +1049,12 @@ nsContainerFrame::FinishReflowChild(nsIFrame* aKidFrame,
uint32_t aFlags)
{
nsPoint curOrigin = aKidFrame->GetPosition();
nsRect bounds(aX, aY, aDesiredSize.width, aDesiredSize.height);
aKidFrame->SetRect(bounds);
if (NS_FRAME_NO_MOVE_FRAME != (aFlags & NS_FRAME_NO_MOVE_FRAME)) {
aKidFrame->SetRect(nsRect(aX, aY, aDesiredSize.width, aDesiredSize.height));
} else {
aKidFrame->SetSize(nsSize(aDesiredSize.width, aDesiredSize.height));
}
if (aKidFrame->HasView()) {
nsView* view = aKidFrame->GetView();