зеркало из https://github.com/mozilla/gecko-dev.git
More IRIX bustage - CRLF
This commit is contained in:
Родитель
a0a17486f4
Коммит
f1141bff92
|
@ -111,7 +111,7 @@ NS_NewImageFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame)
|
|||
|
||||
nsImageFrame::nsImageFrame() :
|
||||
mIntrinsicSize(0, 0),
|
||||
mGotInitialReflow(PR_FALSE),
|
||||
mGotInitialReflow(PR_FALSE),
|
||||
mFailureReplace(PR_TRUE)
|
||||
{
|
||||
// Size is constrained if we have a width and height.
|
||||
|
@ -389,7 +389,7 @@ NS_IMETHODIMP nsImageFrame::OnStopDecode(imgIRequest *aRequest, nsIPresContext *
|
|||
if (usemap.IsEmpty()) {
|
||||
presShell->CantRenderReplacedElement(aPresContext, this);
|
||||
}
|
||||
}
|
||||
}
|
||||
mFailureReplace = PR_TRUE;
|
||||
}
|
||||
|
||||
|
@ -1242,7 +1242,7 @@ nsImageFrame::AttributeChanged(nsIPresContext* aPresContext,
|
|||
mImageRequest->GetImageStatus(&loadStatus);
|
||||
|
||||
if (!(loadStatus & imgIRequest::STATUS_SIZE_AVAILABLE)) {
|
||||
if (mImageRequest) {
|
||||
if (mImageRequest) {
|
||||
mFailureReplace = PR_FALSE; // don't cause a CantRenderReplacedElement call
|
||||
mImageRequest->Cancel(NS_ERROR_FAILURE);
|
||||
mImageRequest = nsnull;
|
||||
|
|
|
@ -111,7 +111,7 @@ NS_NewImageFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame)
|
|||
|
||||
nsImageFrame::nsImageFrame() :
|
||||
mIntrinsicSize(0, 0),
|
||||
mGotInitialReflow(PR_FALSE),
|
||||
mGotInitialReflow(PR_FALSE),
|
||||
mFailureReplace(PR_TRUE)
|
||||
{
|
||||
// Size is constrained if we have a width and height.
|
||||
|
@ -389,7 +389,7 @@ NS_IMETHODIMP nsImageFrame::OnStopDecode(imgIRequest *aRequest, nsIPresContext *
|
|||
if (usemap.IsEmpty()) {
|
||||
presShell->CantRenderReplacedElement(aPresContext, this);
|
||||
}
|
||||
}
|
||||
}
|
||||
mFailureReplace = PR_TRUE;
|
||||
}
|
||||
|
||||
|
@ -1242,7 +1242,7 @@ nsImageFrame::AttributeChanged(nsIPresContext* aPresContext,
|
|||
mImageRequest->GetImageStatus(&loadStatus);
|
||||
|
||||
if (!(loadStatus & imgIRequest::STATUS_SIZE_AVAILABLE)) {
|
||||
if (mImageRequest) {
|
||||
if (mImageRequest) {
|
||||
mFailureReplace = PR_FALSE; // don't cause a CantRenderReplacedElement call
|
||||
mImageRequest->Cancel(NS_ERROR_FAILURE);
|
||||
mImageRequest = nsnull;
|
||||
|
|
Загрузка…
Ссылка в новой задаче