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

Bug 384874 Fix regression from previous patch for bug 382746 r=Enn sr=bz

Browse Source
This commit is contained in:
neil@parkwaycc.co.uk 2007-06-21 03:25:06 -07:00
parent 72d288c70e
commit 6993fe36b9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/xul/base/src/grid/nsGridRowLeafLayout.cpp
View File

@ -238,7 +238,7 @@ nsGridRowLeafLayout::PopulateBoxSizes(nsIBox* aBox, nsBoxLayoutState& aState, ns
last = current;
}
if (child)
if (child && !column->mIsBogus)
child = child->GetNextBox();
}

4
layout/xul/base/src/nsSprocketLayout.cpp
View File

@ -452,8 +452,6 @@ nsSprocketLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
{
childComputedBoxSize = childComputedBoxSize->next;
childBoxSize = childBoxSize->next;
if (child)
child = child->GetNextBox();
count++;
x = nextX;
y = nextY;
@ -784,6 +782,8 @@ nsSprocketLayout::PopulateBoxSizes(nsIBox* aBox, nsBoxLayoutState& aState, nsBox
while(child)
{
while (currentBox && currentBox->bogus)
currentBox = currentBox->next;
++childCount;
nsSize pref(0,0);
nsSize min(0,0);