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

Bug 1178250 - Don't call ConsiderChildOverflow until the child has been placed in the right location when reflowing a vertical-rl table. r=dholbert

Browse Source
This commit is contained in:
Jonathan Kew
2015-06-30 10:14:19 +01:00
parent 8ff157c3be
commit eb883effc8
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
layout/tables/nsTableFrame.cpp
View File

@@ -1916,12 +1916,6 @@ nsTableFrame::Reflow(nsPresContext* aPresContext,
mutable_rs.mFlags.mSpecialBSizeReflow = false;
}
}
else {
// Calculate the overflow area contribution from our children.
for (nsIFrame* kid : mFrames) {
ConsiderChildOverflow(aDesiredSize.mOverflowAreas, kid);
}
}
aDesiredSize.ISize(wm) = aReflowState.ComputedISize() +
aReflowState.ComputedLogicalBorderPadding().IStartEnd(wm);
@@ -1941,6 +1935,14 @@ nsTableFrame::Reflow(nsPresContext* aPresContext,
}
}
// Calculate the overflow area contribution from our children. We couldn't
// do this on the fly during ReflowChildren(), because in vertical-rl mode
// with unconstrained width, we weren't placing them in their final positions
// until the fixupKidPositions loop just above.
for (nsIFrame* kid : mFrames) {
ConsiderChildOverflow(aDesiredSize.mOverflowAreas, kid);
}
LogicalMargin borderPadding = GetChildAreaOffset(wm, &aReflowState);
SetColumnDimensions(aDesiredSize.BSize(wm), wm, borderPadding,
aDesiredSize.Width());
@@ -3259,7 +3261,6 @@ nsTableFrame::ReflowChildren(nsTableReflowState& aReflowState,
aReflowState.availSize.BSize(wm) -= cellSpacingB + kidRect.BSize(wm);
}
}
ConsiderChildOverflow(aOverflowAreas, kidFrame);
}
// We've now propagated the column resizes and geometry changes to all