зеркало из https://github.com/mozilla/gecko-dev.git
Don't push lines when height is unconstrained, even if current height is bigger than NS_UNCONSTRAINEDSIZE. b=265027 r+sr=roc a=mkaply
This commit is contained in:
Родитель
92cb1ff0a6
Коммит
c6f69590b6
|
@ -4178,8 +4178,10 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
|
||||||
// fits; we'll assume it does, so that the maximum width will get
|
// fits; we'll assume it does, so that the maximum width will get
|
||||||
// updated below. The line will be reflowed again and pushed then
|
// updated below. The line will be reflowed again and pushed then
|
||||||
// if necessary.
|
// if necessary.
|
||||||
if ((mLines.front() != aLine) && (newY > aState.mBottomEdge)
|
if (mLines.front() != aLine &&
|
||||||
&& !aUpdateMaximumWidth) {
|
newY > aState.mBottomEdge &&
|
||||||
|
aState.mBottomEdge != NS_UNCONSTRAINEDSIZE &&
|
||||||
|
!aUpdateMaximumWidth) {
|
||||||
// Push this line and all of it's children and anything else that
|
// Push this line and all of it's children and anything else that
|
||||||
// follows to our next-in-flow
|
// follows to our next-in-flow
|
||||||
NS_ASSERTION((aState.mCurrentLine == aLine), "oops");
|
NS_ASSERTION((aState.mCurrentLine == aLine), "oops");
|
||||||
|
|
|
@ -4178,8 +4178,10 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
|
||||||
// fits; we'll assume it does, so that the maximum width will get
|
// fits; we'll assume it does, so that the maximum width will get
|
||||||
// updated below. The line will be reflowed again and pushed then
|
// updated below. The line will be reflowed again and pushed then
|
||||||
// if necessary.
|
// if necessary.
|
||||||
if ((mLines.front() != aLine) && (newY > aState.mBottomEdge)
|
if (mLines.front() != aLine &&
|
||||||
&& !aUpdateMaximumWidth) {
|
newY > aState.mBottomEdge &&
|
||||||
|
aState.mBottomEdge != NS_UNCONSTRAINEDSIZE &&
|
||||||
|
!aUpdateMaximumWidth) {
|
||||||
// Push this line and all of it's children and anything else that
|
// Push this line and all of it's children and anything else that
|
||||||
// follows to our next-in-flow
|
// follows to our next-in-flow
|
||||||
NS_ASSERTION((aState.mCurrentLine == aLine), "oops");
|
NS_ASSERTION((aState.mCurrentLine == aLine), "oops");
|
||||||
|
|
Загрузка…
Ссылка в новой задаче