Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed an assert

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@2772 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy
1998-05-30 23:56:28 +00:00
parent 36db5c6c2b
commit a53a8a9faf
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/layout/base/src/nsSpaceManager.cpp
View File

@@ -852,9 +852,8 @@ PRBool nsSpaceManager::RemoveRegion(nsIFrame* aFrame)
if (nsnull != band) {
// If we found a rect occupied by aFrame in this band or the previous band
// then try to join the two bands
if (prevFoundMatchingRect || (foundMatchingRect && (nsnull != prevBand))) {
if ((nsnull != prevBand) && (foundMatchingRect || prevFoundMatchingRect)) {
// Try and join this band with the previous band
NS_ASSERTION(nsnull != prevBand, "no previous band");
JoinBands(band, prevBand);
}
}

3
mozilla/layout/generic/nsSpaceManager.cpp
View File

@@ -852,9 +852,8 @@ PRBool nsSpaceManager::RemoveRegion(nsIFrame* aFrame)
if (nsnull != band) {
// If we found a rect occupied by aFrame in this band or the previous band
// then try to join the two bands
if (prevFoundMatchingRect || (foundMatchingRect && (nsnull != prevBand))) {
if ((nsnull != prevBand) && (foundMatchingRect || prevFoundMatchingRect)) {
// Try and join this band with the previous band
NS_ASSERTION(nsnull != prevBand, "no previous band");
JoinBands(band, prevBand);
}
}