зеркало из https://github.com/mozilla/pjs.git
Reproducible crash when printing page [@nsFloaterCacheList::~nsFloaterCacheList()] (bug=149074)
r=karnaze@netscape.com sr=bzbarsky@mit.edu
This commit is contained in:
Родитель
8da4824180
Коммит
ccf995ebf0
|
@ -963,7 +963,12 @@ nsImageFrame::Reflow(nsIPresContext* aPresContext,
|
||||||
// in Paginated mode, we need to have a constrained height, and have a height larger than our available height
|
// in Paginated mode, we need to have a constrained height, and have a height larger than our available height
|
||||||
PRBool isPaginated;
|
PRBool isPaginated;
|
||||||
aPresContext->IsPaginated(&isPaginated);
|
aPresContext->IsPaginated(&isPaginated);
|
||||||
if ((isPaginated) &&
|
PRUint32 loadStatus = imgIRequest::STATUS_NONE;
|
||||||
|
if (mLoads[0].mRequest) {
|
||||||
|
mLoads[0].mRequest->GetImageStatus(&loadStatus);
|
||||||
|
}
|
||||||
|
if (isPaginated &&
|
||||||
|
((loadStatus & imgIRequest::STATUS_SIZE_AVAILABLE) || mSizeConstrained) &&
|
||||||
(NS_UNCONSTRAINEDSIZE != aReflowState.availableHeight) &&
|
(NS_UNCONSTRAINEDSIZE != aReflowState.availableHeight) &&
|
||||||
(aMetrics.height > aReflowState.availableHeight)) {
|
(aMetrics.height > aReflowState.availableHeight)) {
|
||||||
nsCOMPtr<nsIAtom> fType;
|
nsCOMPtr<nsIAtom> fType;
|
||||||
|
|
|
@ -963,7 +963,12 @@ nsImageFrame::Reflow(nsIPresContext* aPresContext,
|
||||||
// in Paginated mode, we need to have a constrained height, and have a height larger than our available height
|
// in Paginated mode, we need to have a constrained height, and have a height larger than our available height
|
||||||
PRBool isPaginated;
|
PRBool isPaginated;
|
||||||
aPresContext->IsPaginated(&isPaginated);
|
aPresContext->IsPaginated(&isPaginated);
|
||||||
if ((isPaginated) &&
|
PRUint32 loadStatus = imgIRequest::STATUS_NONE;
|
||||||
|
if (mLoads[0].mRequest) {
|
||||||
|
mLoads[0].mRequest->GetImageStatus(&loadStatus);
|
||||||
|
}
|
||||||
|
if (isPaginated &&
|
||||||
|
((loadStatus & imgIRequest::STATUS_SIZE_AVAILABLE) || mSizeConstrained) &&
|
||||||
(NS_UNCONSTRAINEDSIZE != aReflowState.availableHeight) &&
|
(NS_UNCONSTRAINEDSIZE != aReflowState.availableHeight) &&
|
||||||
(aMetrics.height > aReflowState.availableHeight)) {
|
(aMetrics.height > aReflowState.availableHeight)) {
|
||||||
nsCOMPtr<nsIAtom> fType;
|
nsCOMPtr<nsIAtom> fType;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче