зеркало из https://github.com/mozilla/gecko-dev.git
bug 154924 - use NS_FRAME_COMPLETE rather than macro as it was before bug 145305 was checked in. sr=kin
This commit is contained in:
Родитель
28f33b3c33
Коммит
ab4deb43a5
|
@ -5444,7 +5444,7 @@ nsTextFrame::Reflow(nsIPresContext* aPresContext,
|
||||||
// - we fit in the available space. We may be complete, but if we
|
// - we fit in the available space. We may be complete, but if we
|
||||||
// return a larger desired width than is available we may get pushed
|
// return a larger desired width than is available we may get pushed
|
||||||
// and our frame width won't get set
|
// and our frame width won't get set
|
||||||
if (NS_FRAME_IS_COMPLETE(aStatus) && (aMetrics.width <= maxWidth)) {
|
if ((NS_FRAME_COMPLETE == aStatus) && (aMetrics.width <= maxWidth)) {
|
||||||
mState |= TEXT_OPTIMIZE_RESIZE;
|
mState |= TEXT_OPTIMIZE_RESIZE;
|
||||||
mRect.width = aMetrics.width;
|
mRect.width = aMetrics.width;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5444,7 +5444,7 @@ nsTextFrame::Reflow(nsIPresContext* aPresContext,
|
||||||
// - we fit in the available space. We may be complete, but if we
|
// - we fit in the available space. We may be complete, but if we
|
||||||
// return a larger desired width than is available we may get pushed
|
// return a larger desired width than is available we may get pushed
|
||||||
// and our frame width won't get set
|
// and our frame width won't get set
|
||||||
if (NS_FRAME_IS_COMPLETE(aStatus) && (aMetrics.width <= maxWidth)) {
|
if ((NS_FRAME_COMPLETE == aStatus) && (aMetrics.width <= maxWidth)) {
|
||||||
mState |= TEXT_OPTIMIZE_RESIZE;
|
mState |= TEXT_OPTIMIZE_RESIZE;
|
||||||
mRect.width = aMetrics.width;
|
mRect.width = aMetrics.width;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче