зеркало из https://github.com/mozilla/pjs.git
Fix warning from Bug 285608. r+sr=roc.
This commit is contained in:
Родитель
b3ab985499
Коммит
19d17c72f8
|
@ -1005,11 +1005,6 @@ nsBlockReflowState::PlaceBelowCurrentLineFloats(nsFloatCacheFreeList& aList, PRB
|
||||||
NS_ASSERTION(placed || !aForceFit,
|
NS_ASSERTION(placed || !aForceFit,
|
||||||
"If we're in force-fit mode, we should have placed the float");
|
"If we're in force-fit mode, we should have placed the float");
|
||||||
|
|
||||||
// XXX We could deal with this situation better by breaking before
|
|
||||||
// the associated placeholder
|
|
||||||
NS_WARN_IF_FALSE(NS_FRAME_IS_TRUNCATED(reflowStatus) && aForceFit,
|
|
||||||
"This situation currently leads to data not printing");
|
|
||||||
|
|
||||||
if (!placed || (NS_FRAME_IS_TRUNCATED(reflowStatus) && !aForceFit)) {
|
if (!placed || (NS_FRAME_IS_TRUNCATED(reflowStatus) && !aForceFit)) {
|
||||||
// return before processing all of the floats, since the line will be pushed.
|
// return before processing all of the floats, since the line will be pushed.
|
||||||
return PR_FALSE;
|
return PR_FALSE;
|
||||||
|
@ -1020,6 +1015,11 @@ nsBlockReflowState::PlaceBelowCurrentLineFloats(nsFloatCacheFreeList& aList, PRB
|
||||||
if (NS_FAILED(rv))
|
if (NS_FAILED(rv))
|
||||||
return PR_FALSE;
|
return PR_FALSE;
|
||||||
} else {
|
} else {
|
||||||
|
// XXX We could deal with truncated frames better by breaking before
|
||||||
|
// the associated placeholder
|
||||||
|
NS_WARN_IF_FALSE(!NS_FRAME_IS_TRUNCATED(reflowStatus),
|
||||||
|
"This situation currently leads to data not printing");
|
||||||
|
|
||||||
// Float is complete. We need to delete any leftover placeholders now.
|
// Float is complete. We need to delete any leftover placeholders now.
|
||||||
nsIFrame* nextPlaceholder = fc->mPlaceholder->GetNextInFlow();
|
nsIFrame* nextPlaceholder = fc->mPlaceholder->GetNextInFlow();
|
||||||
if (nextPlaceholder) {
|
if (nextPlaceholder) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче