Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed obsolete method nsIDocumentLoader::LoadOpenedDocument.

Browse Source
This commit is contained in:
rpotts%netscape.com 1999-12-29 05:10:21 +00:00
parent c9377dd1ab
commit 38fc9e5e0f
5 changed files with 14 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docshell/base/nsWebShell.cpp
View File

@ -1730,19 +1730,11 @@ nsWebShell::DoContent(const char * aContentType,
// own load group!!! So the request would get canceled out from under us...
// after retargeting we may be able to safely call DoLoadURL.
DoLoadURL(aUri, strCommand, nsnull, nsIChannel::LOAD_NORMAL, 0, nsnull, PR_FALSE);
#if 0
return mDocLoader->LoadOpenedDocument(aOpenedChannel,
strCommand,
(nsIWebShell*)this,
nsnull,
nsnull,
aContentHandler);
#else
return CreateViewer(aOpenedChannel,
aContentType,
strCommand,
aContentHandler);
#endif
}
static NS_DEFINE_IID(kIDocumentLoaderFactoryIID, NS_IDOCUMENTLOADERFACTORY_IID);

28
uriloader/base/nsDocLoader.cpp
View File

@ -117,13 +117,6 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHOD LoadOpenedDocument(nsIChannel * aOpenedChannel,
const char * aCommand,
nsIContentViewerContainer *aContainer,
nsIInputStream * aPostDataStream,
nsIURI * aReffererUrl,
nsIStreamListener ** aContentHandler);
// nsIDocumentLoader interface
NS_IMETHOD LoadDocument(nsIURI * aUri,
const char *aCommand,
@ -347,18 +340,6 @@ nsDocLoaderImpl::CreateDocumentLoader(nsIDocumentLoader** anInstance)
return rv;
}
NS_IMETHODIMP
nsDocLoaderImpl::LoadOpenedDocument(nsIChannel * aOpenedChannel,
const char * aCommand,
nsIContentViewerContainer *aContainer,
nsIInputStream * aPostDataStream,
nsIURI * aReffererUrl,
nsIStreamListener ** aContentHandler)
{
NS_ASSERTION(0, "This method is OBSOLETE!!");
return NS_ERROR_FAILURE;
}
static NS_DEFINE_CID(kURILoaderCID, NS_URI_LOADER_CID);
@ -422,9 +403,12 @@ nsDocLoaderImpl::LoadDocument(nsIURI * aUri,
mLoadGroup,
getter_AddRefs(openContext));
if (openContext) {
mLoadGroup = do_QueryInterface(openContext);
}
// I think that this is wrong... Do *not* destroy the loadGroup assosicated
// with a DocLoader if the URI is retargeted!! The DocLoader does not care.
//
/// if (openContext) {
/// mLoadGroup = do_QueryInterface(openContext);
/// }
}
return rv;

10
webshell/public/nsIDocumentLoader.h
View File

@ -97,16 +97,6 @@ class nsIDocumentLoader : public nsISupports
public:
NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOCUMENTLOADER_IID)
// url dispatching shortcut method....we return the
// doc bind info in the form of a stream listener
// which we'll use to feed data into the content viewer
NS_IMETHOD LoadOpenedDocument(nsIChannel * aOpenedChannel,
const char * aCommand,
nsIContentViewerContainer *aContainer,
nsIInputStream * aPostDataStream,
nsIURI * aReffererUrl,
nsIStreamListener ** aContentHandler) = 0;
NS_IMETHOD LoadDocument(nsIURI * aUri,
const char* aCommand,
nsISupports* aContainer,

28
webshell/src/nsDocLoader.cpp
View File

@ -117,13 +117,6 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHOD LoadOpenedDocument(nsIChannel * aOpenedChannel,
const char * aCommand,
nsIContentViewerContainer *aContainer,
nsIInputStream * aPostDataStream,
nsIURI * aReffererUrl,
nsIStreamListener ** aContentHandler);
// nsIDocumentLoader interface
NS_IMETHOD LoadDocument(nsIURI * aUri,
const char *aCommand,
@ -347,18 +340,6 @@ nsDocLoaderImpl::CreateDocumentLoader(nsIDocumentLoader** anInstance)
return rv;
}
NS_IMETHODIMP
nsDocLoaderImpl::LoadOpenedDocument(nsIChannel * aOpenedChannel,
const char * aCommand,
nsIContentViewerContainer *aContainer,
nsIInputStream * aPostDataStream,
nsIURI * aReffererUrl,
nsIStreamListener ** aContentHandler)
{
NS_ASSERTION(0, "This method is OBSOLETE!!");
return NS_ERROR_FAILURE;
}
static NS_DEFINE_CID(kURILoaderCID, NS_URI_LOADER_CID);
@ -422,9 +403,12 @@ nsDocLoaderImpl::LoadDocument(nsIURI * aUri,
mLoadGroup,
getter_AddRefs(openContext));
if (openContext) {
mLoadGroup = do_QueryInterface(openContext);
}
// I think that this is wrong... Do *not* destroy the loadGroup assosicated
// with a DocLoader if the URI is retargeted!! The DocLoader does not care.
//
/// if (openContext) {
/// mLoadGroup = do_QueryInterface(openContext);
/// }
}
return rv;

10
webshell/src/nsWebShell.cpp
View File

@ -1730,19 +1730,11 @@ nsWebShell::DoContent(const char * aContentType,
// own load group!!! So the request would get canceled out from under us...
// after retargeting we may be able to safely call DoLoadURL.
DoLoadURL(aUri, strCommand, nsnull, nsIChannel::LOAD_NORMAL, 0, nsnull, PR_FALSE);
#if 0
return mDocLoader->LoadOpenedDocument(aOpenedChannel,
strCommand,
(nsIWebShell*)this,
nsnull,
nsnull,
aContentHandler);
#else
return CreateViewer(aOpenedChannel,
aContentType,
strCommand,
aContentHandler);
#endif
}
static NS_DEFINE_IID(kIDocumentLoaderFactoryIID, NS_IDOCUMENTLOADERFACTORY_IID);