corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fallback to alternate content if Instantiate() fails

Browse Source 
bug 310515 r+sr=bz
This commit is contained in:
cbiesinger@web.de
2005-10-03 12:55:07 +00:00
parent 6923985fd7
commit ebc0dcbbb4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
content/base/src/nsObjectLoadingContent.cpp
View File

@@ -120,7 +120,10 @@ nsAsyncInstantiateEvent::HandleEvent(PLEvent* event)
PL_GetEventOwner(event));
// Make sure that we still have the right frame
if (con->GetFrame() == ev->mFrame) {
ev->mFrame->Instantiate(ev->mContentType.get(), ev->mURI);
nsresult rv = ev->mFrame->Instantiate(ev->mContentType.get(), ev->mURI);
if (NS_FAILED(rv)) {
con->Fallback(PR_TRUE);
}
}
return nsnull;
}
@@ -801,7 +804,6 @@ nsObjectLoadingContent::ObjectURIChanged(nsIURI* aURI,
mInstantiating = PR_FALSE;
// XXX should this use current doc, or owner doc?
nsCOMPtr<nsILoadGroup> group = doc->GetDocumentLoadGroup();
nsCOMPtr<nsIChannel> chan;
rv = NS_NewChannel(getter_AddRefs(chan), aURI, nsnull, group, this);