зеркало из https://github.com/mozilla/pjs.git
Change NS_COMFALSE instances to NS_ERROR_ABORT's
This commit is contained in:
Родитель
f33e418434
Коммит
d4abf23615
|
@ -114,7 +114,7 @@ nsSpaceManager::YMost(nscoord& aYMost) const
|
||||||
|
|
||||||
if (mBandList.IsEmpty()) {
|
if (mBandList.IsEmpty()) {
|
||||||
aYMost = 0;
|
aYMost = 0;
|
||||||
result = NS_COMFALSE;
|
result = NS_ERROR_ABORT;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
BandRect* lastRect = mBandList.Tail();
|
BandRect* lastRect = mBandList.Tail();
|
||||||
|
@ -260,7 +260,7 @@ nsSpaceManager::GetBandData(nscoord aYOffset,
|
||||||
// band, then all the space is available
|
// band, then all the space is available
|
||||||
nscoord yMost;
|
nscoord yMost;
|
||||||
|
|
||||||
if ((NS_COMFALSE == YMost(yMost)) || (y >= yMost)) {
|
if ((NS_ERROR_ABORT == YMost(yMost)) || (y >= yMost)) {
|
||||||
// All the requested space is available
|
// All the requested space is available
|
||||||
aBandData.mCount = 1;
|
aBandData.mCount = 1;
|
||||||
aBandData.mTrapezoids[0] = nsRect(0, aYOffset, aMaxSize.width, aMaxSize.height);
|
aBandData.mTrapezoids[0] = nsRect(0, aYOffset, aMaxSize.width, aMaxSize.height);
|
||||||
|
@ -611,7 +611,7 @@ nsSpaceManager::InsertBandRect(BandRect* aBandRect)
|
||||||
// If there are no existing bands or this rect is below the bottommost
|
// If there are no existing bands or this rect is below the bottommost
|
||||||
// band, then add a new band
|
// band, then add a new band
|
||||||
nscoord yMost;
|
nscoord yMost;
|
||||||
if ((NS_COMFALSE == YMost(yMost)) || (aBandRect->mTop >= yMost)) {
|
if ((NS_ERROR_ABORT == YMost(yMost)) || (aBandRect->mTop >= yMost)) {
|
||||||
mBandList.Append(aBandRect);
|
mBandList.Append(aBandRect);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -114,7 +114,7 @@ nsSpaceManager::YMost(nscoord& aYMost) const
|
||||||
|
|
||||||
if (mBandList.IsEmpty()) {
|
if (mBandList.IsEmpty()) {
|
||||||
aYMost = 0;
|
aYMost = 0;
|
||||||
result = NS_COMFALSE;
|
result = NS_ERROR_ABORT;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
BandRect* lastRect = mBandList.Tail();
|
BandRect* lastRect = mBandList.Tail();
|
||||||
|
@ -260,7 +260,7 @@ nsSpaceManager::GetBandData(nscoord aYOffset,
|
||||||
// band, then all the space is available
|
// band, then all the space is available
|
||||||
nscoord yMost;
|
nscoord yMost;
|
||||||
|
|
||||||
if ((NS_COMFALSE == YMost(yMost)) || (y >= yMost)) {
|
if ((NS_ERROR_ABORT == YMost(yMost)) || (y >= yMost)) {
|
||||||
// All the requested space is available
|
// All the requested space is available
|
||||||
aBandData.mCount = 1;
|
aBandData.mCount = 1;
|
||||||
aBandData.mTrapezoids[0] = nsRect(0, aYOffset, aMaxSize.width, aMaxSize.height);
|
aBandData.mTrapezoids[0] = nsRect(0, aYOffset, aMaxSize.width, aMaxSize.height);
|
||||||
|
@ -611,7 +611,7 @@ nsSpaceManager::InsertBandRect(BandRect* aBandRect)
|
||||||
// If there are no existing bands or this rect is below the bottommost
|
// If there are no existing bands or this rect is below the bottommost
|
||||||
// band, then add a new band
|
// band, then add a new band
|
||||||
nscoord yMost;
|
nscoord yMost;
|
||||||
if ((NS_COMFALSE == YMost(yMost)) || (aBandRect->mTop >= yMost)) {
|
if ((NS_ERROR_ABORT == YMost(yMost)) || (aBandRect->mTop >= yMost)) {
|
||||||
mBandList.Append(aBandRect);
|
mBandList.Append(aBandRect);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче