зеркало из https://github.com/mozilla/pjs.git
no math with NS_UNCONSTRAINEDSIZE please, bug 14862 r=karnaze sr=roc+moz
This commit is contained in:
Родитель
51ac39ea67
Коммит
93aab3e317
|
@ -5256,7 +5256,8 @@ nsBlockFrame::ReflowFloater(nsBlockReflowState& aState,
|
|||
availWidth -= availWidth % twp;
|
||||
}
|
||||
}
|
||||
nscoord availHeight = (NS_UNCONSTRAINEDSIZE == aState.mAvailSpaceRect.height)
|
||||
nscoord availHeight = ((NS_UNCONSTRAINEDSIZE == aState.mAvailSpaceRect.height) ||
|
||||
(NS_UNCONSTRAINEDSIZE == aState.mContentArea.height))
|
||||
? NS_UNCONSTRAINEDSIZE
|
||||
: PR_MAX(0, aState.mContentArea.height - aState.mY);
|
||||
|
||||
|
|
|
@ -5256,7 +5256,8 @@ nsBlockFrame::ReflowFloater(nsBlockReflowState& aState,
|
|||
availWidth -= availWidth % twp;
|
||||
}
|
||||
}
|
||||
nscoord availHeight = (NS_UNCONSTRAINEDSIZE == aState.mAvailSpaceRect.height)
|
||||
nscoord availHeight = ((NS_UNCONSTRAINEDSIZE == aState.mAvailSpaceRect.height) ||
|
||||
(NS_UNCONSTRAINEDSIZE == aState.mContentArea.height))
|
||||
? NS_UNCONSTRAINEDSIZE
|
||||
: PR_MAX(0, aState.mContentArea.height - aState.mY);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче