bug #23055 (r=warren). Added LOAD_DOCUMENT_URI load attribute for the DocLoader to distinguish doc URIs

git-svn-id: svn://10.0.0.236/trunk@57915 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rpotts%netscape.com
2000-01-15 06:12:54 +00:00
parent 33004f43f4
commit 8457af366d
15 changed files with 172 additions and 63 deletions

View File

@@ -1828,8 +1828,27 @@ nsresult nsWebShell::CreateViewer(nsIChannel* aChannel,
rv = aChannel->GetLoadGroup(getter_AddRefs(currentLoadGroup));
if (NS_SUCCEEDED(rv))
{
if (currentLoadGroup.get() != loadGroup.get())
if (currentLoadGroup.get() != loadGroup.get()) {
nsLoadFlags loadAttribs = 0;
//Cancel any URIs that are currently loading...
/// XXX: Need to do this eventually Stop();
//
// Retarget the document to this loadgroup...
//
if (currentLoadGroup) {
(void) currentLoadGroup->RemoveChannel(aChannel, nsnull, nsnull, nsnull);
}
aChannel->SetLoadGroup(loadGroup);
// Mark the channel as being a document URI...
aChannel->GetLoadAttributes(&loadAttribs);
loadAttribs |= nsIChannel::LOAD_DOCUMENT_URI;
aChannel->SetLoadAttributes(loadAttribs);
loadGroup->AddChannel(aChannel, nsnull);
}
}
/*