mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-27 10:50:35 +00:00
Bug 387201: ASSERTION: If we asked for force-fit, it should have been placed with float, padding. r+sr=roc
This commit is contained in:
parent
6915020208
commit
068fab685a
@ -327,7 +327,7 @@ nsSpaceManager::GetBandAvailableSpace(const BandRect* aBand,
|
||||
|
||||
// No more rects left in the band. If we haven't yet reached the right edge,
|
||||
// then all the remaining space is available
|
||||
if (left < rightEdge) {
|
||||
if (left < rightEdge || aBandData.mCount == 0) {
|
||||
if (aBandData.mCount >= aBandData.mSize) {
|
||||
// Not enough space in the array of trapezoids
|
||||
aBandData.mCount++;
|
||||
@ -879,7 +879,7 @@ nsSpaceManager::AddRectRegion(nsIFrame* aFrame, const nsRect& aUnavailableSpace)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
if (aUnavailableSpace.height <= 0)
|
||||
if (aUnavailableSpace.IsEmpty())
|
||||
return NS_OK;
|
||||
|
||||
// Allocate a band rect
|
||||
@ -930,7 +930,7 @@ nsSpaceManager::RemoveRegion(nsIFrame* aFrame)
|
||||
return NS_ERROR_INVALID_ARG;
|
||||
}
|
||||
|
||||
if (frameInfo->mRect.height > 0) {
|
||||
if (!frameInfo->mRect.IsEmpty()) {
|
||||
NS_ASSERTION(!mBandList.IsEmpty(), "no bands");
|
||||
BandRect* band = mBandList.Head();
|
||||
BandRect* prevBand = nsnull;
|
||||
|
Loading…
Reference in New Issue
Block a user