Fixing nsbeta2+ bug 45019, images didn't show up on document that were fully created with document.open(): document.write();... r=nisheet&rpotts
git-svn-id: svn://10.0.0.236/trunk@74612 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -1914,10 +1914,7 @@ nsHTMLDocument::OpenCommon(nsIURI* aSourceURL)
|
||||
mScriptGlobalObject->GetDocShell(getter_AddRefs(docshell));
|
||||
|
||||
if (docshell) {
|
||||
nsCOMPtr<nsIWebNavigation> wn(do_QueryInterface(docshell));
|
||||
if(wn) {
|
||||
wn->Stop();
|
||||
}
|
||||
docshell->StopLoad();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -318,6 +318,9 @@ NS_IMETHODIMP nsDocShell::CreateLoadInfo(nsIDocShellLoadInfo** aLoadInfo)
|
||||
|
||||
NS_IMETHODIMP nsDocShell::StopLoad()
|
||||
{
|
||||
// Cancel any timers that were set for this loader.
|
||||
CancelRefreshURITimers();
|
||||
|
||||
if(mLoadCookie)
|
||||
{
|
||||
nsCOMPtr<nsIURILoader> uriLoader = do_GetService(NS_URI_LOADER_PROGID);
|
||||
|
||||
@@ -1914,10 +1914,7 @@ nsHTMLDocument::OpenCommon(nsIURI* aSourceURL)
|
||||
mScriptGlobalObject->GetDocShell(getter_AddRefs(docshell));
|
||||
|
||||
if (docshell) {
|
||||
nsCOMPtr<nsIWebNavigation> wn(do_QueryInterface(docshell));
|
||||
if(wn) {
|
||||
wn->Stop();
|
||||
}
|
||||
docshell->StopLoad();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user