Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Detect errors more often by prioritizing its status over size-available

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@21103 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1999-02-18 03:26:19 +00:00
parent 0e2ed2303f
commit 1e83ecb886
2 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/layout/html/base/src/nsImageFrame.cpp
View File

@@ -167,6 +167,9 @@ nsHTMLImageLoader::StartLoadImage(nsIPresContext* aPresContext,
if (nsnull == mImageLoader) {
// Start image loading. Note that we don't specify a background color
// so transparent images are always rendered using a transparency mask
printf("loading ");
fputs(src, stdout);
printf("\n");
rv = aPresContext->StartLoadImage(src, nsnull, aForFrame, aCallBack,
aNeedSizeUpdate, PR_TRUE, &mImageLoader);
if ((NS_OK != rv) || (nsnull == mImageLoader)) {
@@ -369,7 +372,18 @@ static nsresult
UpdateImageFrame(nsIPresContext& aPresContext, nsIFrame* aFrame,
PRIntn aStatus)
{
if (NS_IMAGE_LOAD_STATUS_SIZE_AVAILABLE & aStatus) {
if (NS_IMAGE_LOAD_STATUS_ERROR & aStatus) {
// XXX Turned off for the time being until the frame construction code for
// images that can't be rendered handles floated and absolutely positioned
// images...
#if 0
// We failed to load the image. Notify the pres shell
nsIPresShell* presShell = aPresContext.GetShell();
presShell->CantRenderReplacedElement(&aPresContext, aFrame);
NS_RELEASE(presShell);
#endif
}
else if (NS_IMAGE_LOAD_STATUS_SIZE_AVAILABLE & aStatus) {
// Now that the size is available, trigger a content-changed reflow
nsIContent* content = nsnull;
aFrame->GetContent(&content);
@@ -382,16 +396,6 @@ UpdateImageFrame(nsIPresContext& aPresContext, nsIFrame* aFrame,
}
NS_RELEASE(content);
}
} else if (NS_IMAGE_LOAD_STATUS_ERROR & aStatus) {
// XXX Turned off for the time being until the frame construction code for
// images that can't be rendered handles floated and absolutely positioned
// images...
#if 0
// We failed to load the image. Notify the pres shell
nsIPresShell* presShell = aPresContext.GetShell();
presShell->CantRenderReplacedElement(&aPresContext, aFrame);
NS_RELEASE(presShell);
#endif
}
return NS_OK;
}