diff --git a/mozilla/layout/base/src/nsSpaceManager.cpp b/mozilla/layout/base/src/nsSpaceManager.cpp index 7d1bb47b367..0ef29a7a04f 100644 --- a/mozilla/layout/base/src/nsSpaceManager.cpp +++ b/mozilla/layout/base/src/nsSpaceManager.cpp @@ -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); } } diff --git a/mozilla/layout/generic/nsSpaceManager.cpp b/mozilla/layout/generic/nsSpaceManager.cpp index 7d1bb47b367..0ef29a7a04f 100644 --- a/mozilla/layout/generic/nsSpaceManager.cpp +++ b/mozilla/layout/generic/nsSpaceManager.cpp @@ -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); } }