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

Big changes for Necko load groups. Things are much happier now. Now images work (on pages, but not in chrome).

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@39678 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
warren%netscape.com
1999-07-16 11:14:36 +00:00
parent 016aa13284
commit 84a03567fa
93 changed files with 1398 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
mozilla/content/html/document/src/nsHTMLDocument.cpp
View File

@@ -258,9 +258,20 @@ nsrefcnt nsHTMLDocument::Release()
}
nsresult
#ifdef NECKO
nsHTMLDocument::Reset(nsIChannel* aChannel)
#else
nsHTMLDocument::Reset(nsIURI *aURL)
#endif
{
#ifdef NECKO
nsresult result = nsDocument::Reset(aChannel);
nsCOMPtr<nsIURI> aURL;
result = aChannel->GetURI(getter_AddRefs(aURL));
if (NS_FAILED(result)) return result;
#else
nsresult result = nsDocument::Reset(aURL);
#endif
if (NS_FAILED(result)) {
return result;
}
@@ -331,21 +342,35 @@ nsHTMLDocument::CreateShell(nsIPresContext* aContext,
}
NS_IMETHODIMP
nsHTMLDocument::StartDocumentLoad(nsIURI *aURL,
nsHTMLDocument::StartDocumentLoad(const char* aCommand,
#ifdef NECKO
nsIChannel* aChannel,
#else
nsIURI *aURL,
#endif
nsIContentViewerContainer* aContainer,
nsIStreamListener **aDocListener,
const char* aCommand)
nsIStreamListener **aDocListener)
{
nsresult rv = nsDocument::StartDocumentLoad(aURL,
nsresult rv = nsDocument::StartDocumentLoad(aCommand,
#ifdef NECKO
aChannel,
#else
aURL,
#endif
aContainer,
aDocListener,
aCommand);
aDocListener);
if (NS_FAILED(rv)) {
return rv;
}
nsIWebShell* webShell;
#ifdef NECKO
nsCOMPtr<nsIURI> aURL;
rv = aChannel->GetURI(getter_AddRefs(aURL));
if (NS_FAILED(rv)) return rv;
#endif
static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID);
static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);
@@ -1413,7 +1438,11 @@ nsHTMLDocument::OpenCommon(nsIURI* aSourceURL)
// The open occurred after the document finished loading.
// So we reset the document and create a new one.
if (nsnull == mParser) {
#ifdef NECKO
// XXX help!
#else
result = Reset(aSourceURL);
#endif
if (NS_OK == result) {
static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID);
static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);