From 3fb5ffef0399042c93e6027e97030b3aea8c6fd1 Mon Sep 17 00:00:00 2001 From: "pavlov%netscape.com" Date: Sun, 21 Oct 2001 00:12:53 +0000 Subject: [PATCH] fix for bug 105257 r=dbaron sr=mscott git-svn-id: svn://10.0.0.236/trunk@105890 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsImageFrame.cpp | 5 +---- mozilla/layout/html/base/src/nsImageFrame.cpp | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index c909a6b5a44..b8a508d4815 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -538,7 +538,7 @@ NS_IMETHODIMP nsImageFrame::OnStopDecode(imgIRequest *aRequest, nsIPresContext * if (whichLoad == -1) return NS_ERROR_FAILURE; - if (whichLoad == 2) { + if (whichLoad == 1) { if (NS_SUCCEEDED(aStatus)) { if (mLoads[0].mRequest) { mLoads[0].mRequest->Cancel(NS_ERROR_FAILURE); @@ -1040,7 +1040,6 @@ nsImageFrame::Paint(nsIPresContext* aPresContext, aWhichLayer); nsCOMPtr imgCon; - nsCOMPtr lowImgCon; PRUint32 loadStatus = imgIRequest::STATUS_ERROR; @@ -1073,8 +1072,6 @@ nsImageFrame::Paint(nsIPresContext* aPresContext, if (loadStatus & imgIRequest::STATUS_ERROR) { if (imgCon) { inner.SizeTo(mComputedSize); - } else if (lowImgCon) { - // XXX need to handle low image... } } diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp index c909a6b5a44..b8a508d4815 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.cpp +++ b/mozilla/layout/html/base/src/nsImageFrame.cpp @@ -538,7 +538,7 @@ NS_IMETHODIMP nsImageFrame::OnStopDecode(imgIRequest *aRequest, nsIPresContext * if (whichLoad == -1) return NS_ERROR_FAILURE; - if (whichLoad == 2) { + if (whichLoad == 1) { if (NS_SUCCEEDED(aStatus)) { if (mLoads[0].mRequest) { mLoads[0].mRequest->Cancel(NS_ERROR_FAILURE); @@ -1040,7 +1040,6 @@ nsImageFrame::Paint(nsIPresContext* aPresContext, aWhichLayer); nsCOMPtr imgCon; - nsCOMPtr lowImgCon; PRUint32 loadStatus = imgIRequest::STATUS_ERROR; @@ -1073,8 +1072,6 @@ nsImageFrame::Paint(nsIPresContext* aPresContext, if (loadStatus & imgIRequest::STATUS_ERROR) { if (imgCon) { inner.SizeTo(mComputedSize); - } else if (lowImgCon) { - // XXX need to handle low image... } }