mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-24 05:44:10 +00:00
necko change: nsIStreamListener::OnDataAvailable now takes a nsIInputStream instead of a nsIBufferInputStream.
This commit is contained in:
parent
bd5f2eaa51
commit
25a6e7c788
@ -84,7 +84,7 @@ public:
|
||||
NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; }
|
||||
NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; }
|
||||
// nsIStreamListener methods:
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
#else
|
||||
NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType);
|
||||
NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax);
|
||||
@ -192,7 +192,7 @@ ImageListener::GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo)
|
||||
|
||||
NS_IMETHODIMP
|
||||
#ifdef NECKO
|
||||
ImageListener::OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr,
|
||||
ImageListener::OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr,
|
||||
PRUint32 sourceOffset, PRUint32 count)
|
||||
#else
|
||||
ImageListener::OnDataAvailable(nsIURI* aURL, nsIInputStream* aStream,
|
||||
|
@ -117,7 +117,7 @@ public:
|
||||
NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; }
|
||||
NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; }
|
||||
// nsIStreamListener methods:
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
#else
|
||||
NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo);
|
||||
NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 Progress, PRUint32 ProgressMax);
|
||||
@ -137,7 +137,7 @@ protected:
|
||||
PRBool mInterrupted;
|
||||
ImageNetContextImpl *mContext;
|
||||
#ifdef NECKO
|
||||
nsIBufferInputStream *mStream;
|
||||
nsIInputStream *mStream;
|
||||
#else
|
||||
nsIInputStream *mStream;
|
||||
#endif
|
||||
@ -220,7 +220,7 @@ ImageConsumer::OnStartBinding(nsIURI* aURL, const char *aContentType)
|
||||
|
||||
NS_IMETHODIMP
|
||||
#ifdef NECKO
|
||||
ImageConsumer::OnDataAvailable(nsISupports* aContext, nsIBufferInputStream *pIStream,
|
||||
ImageConsumer::OnDataAvailable(nsISupports* aContext, nsIInputStream *pIStream,
|
||||
PRUint32 offset, PRUint32 length)
|
||||
#else
|
||||
ImageConsumer::OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUint32 length)
|
||||
|
@ -1097,7 +1097,7 @@ nsParser::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *err
|
||||
* @return error code (usually 0)
|
||||
*/
|
||||
#ifdef NECKO
|
||||
nsresult nsParser::OnDataAvailable(nsISupports* aContext, nsIBufferInputStream *pIStream, PRUint32 sourceOffset, PRUint32 aLength)
|
||||
nsresult nsParser::OnDataAvailable(nsISupports* aContext, nsIInputStream *pIStream, PRUint32 sourceOffset, PRUint32 aLength)
|
||||
#else
|
||||
nsresult nsParser::OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUint32 aLength)
|
||||
#endif
|
||||
|
@ -249,7 +249,7 @@ friend class CTokenHandler;
|
||||
NS_IMETHOD OnStartRequest(nsISupports *ctxt);
|
||||
NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg);
|
||||
// nsIStreamListener methods:
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
#else
|
||||
NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo);
|
||||
NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 Progress, PRUint32 ProgressMax);
|
||||
|
@ -69,7 +69,7 @@ public:
|
||||
NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_ERROR_NOT_IMPLEMENTED; }
|
||||
NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_ERROR_NOT_IMPLEMENTED; }
|
||||
// nsIStreamListener methods:
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
#else
|
||||
// nsIStreamListener
|
||||
NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType);
|
||||
@ -692,7 +692,7 @@ PluginListener::GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo)
|
||||
|
||||
NS_IMETHODIMP
|
||||
#ifdef NECKO
|
||||
PluginListener::OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
|
||||
PluginListener::OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
|
||||
#else
|
||||
PluginListener::OnDataAvailable(nsIURI* aURL, nsIInputStream* aStream,
|
||||
PRUint32 aCount)
|
||||
|
@ -84,7 +84,7 @@ public:
|
||||
NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; }
|
||||
NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; }
|
||||
// nsIStreamListener methods:
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
#else
|
||||
NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType);
|
||||
NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax);
|
||||
@ -192,7 +192,7 @@ ImageListener::GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo)
|
||||
|
||||
NS_IMETHODIMP
|
||||
#ifdef NECKO
|
||||
ImageListener::OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr,
|
||||
ImageListener::OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr,
|
||||
PRUint32 sourceOffset, PRUint32 count)
|
||||
#else
|
||||
ImageListener::OnDataAvailable(nsIURI* aURL, nsIInputStream* aStream,
|
||||
|
@ -397,7 +397,7 @@ public:
|
||||
NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; }
|
||||
NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; }
|
||||
// nsIStreamListener methods:
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
|
||||
#else
|
||||
//nsIStreamObserver interface
|
||||
@ -488,7 +488,7 @@ public:
|
||||
const PRUnichar *errorMsg) { return NS_OK; }
|
||||
|
||||
// nsIStreamListener methods:
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr,
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr,
|
||||
PRUint32 sourceOffset, PRUint32 count);
|
||||
|
||||
#else
|
||||
@ -666,7 +666,7 @@ nsPluginCacheListener::OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aPr
|
||||
NS_IMETHODIMP
|
||||
#ifdef NECKO
|
||||
nsPluginCacheListener::OnDataAvailable(nsISupports* ctxt,
|
||||
nsIBufferInputStream* aIStream,
|
||||
nsIInputStream* aIStream,
|
||||
PRUint32 sourceOffset,
|
||||
PRUint32 aLength)
|
||||
#else
|
||||
@ -1053,7 +1053,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::GetBindInfo(nsIURI* aURL, nsStreamBind
|
||||
#ifdef NECKO
|
||||
NS_IMETHODIMP nsPluginStreamListenerPeer::OnDataAvailable(
|
||||
nsISupports* aContext,
|
||||
nsIBufferInputStream *aIStream,
|
||||
nsIInputStream *aIStream,
|
||||
PRUint32 sourceOffset,
|
||||
PRUint32 aLength)
|
||||
#else
|
||||
|
@ -69,7 +69,7 @@ public:
|
||||
NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_ERROR_NOT_IMPLEMENTED; }
|
||||
NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_ERROR_NOT_IMPLEMENTED; }
|
||||
// nsIStreamListener methods:
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
#else
|
||||
// nsIStreamListener
|
||||
NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType);
|
||||
@ -692,7 +692,7 @@ PluginListener::GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo)
|
||||
|
||||
NS_IMETHODIMP
|
||||
#ifdef NECKO
|
||||
PluginListener::OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
|
||||
PluginListener::OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
|
||||
#else
|
||||
PluginListener::OnDataAvailable(nsIURI* aURL, nsIInputStream* aStream,
|
||||
PRUint32 aCount)
|
||||
|
@ -397,7 +397,7 @@ public:
|
||||
NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; }
|
||||
NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; }
|
||||
// nsIStreamListener methods:
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
|
||||
#else
|
||||
//nsIStreamObserver interface
|
||||
@ -488,7 +488,7 @@ public:
|
||||
const PRUnichar *errorMsg) { return NS_OK; }
|
||||
|
||||
// nsIStreamListener methods:
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr,
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr,
|
||||
PRUint32 sourceOffset, PRUint32 count);
|
||||
|
||||
#else
|
||||
@ -666,7 +666,7 @@ nsPluginCacheListener::OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aPr
|
||||
NS_IMETHODIMP
|
||||
#ifdef NECKO
|
||||
nsPluginCacheListener::OnDataAvailable(nsISupports* ctxt,
|
||||
nsIBufferInputStream* aIStream,
|
||||
nsIInputStream* aIStream,
|
||||
PRUint32 sourceOffset,
|
||||
PRUint32 aLength)
|
||||
#else
|
||||
@ -1053,7 +1053,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::GetBindInfo(nsIURI* aURL, nsStreamBind
|
||||
#ifdef NECKO
|
||||
NS_IMETHODIMP nsPluginStreamListenerPeer::OnDataAvailable(
|
||||
nsISupports* aContext,
|
||||
nsIBufferInputStream *aIStream,
|
||||
nsIInputStream *aIStream,
|
||||
PRUint32 sourceOffset,
|
||||
PRUint32 aLength)
|
||||
#else
|
||||
|
@ -69,7 +69,7 @@ public:
|
||||
NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_ERROR_NOT_IMPLEMENTED; }
|
||||
NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_ERROR_NOT_IMPLEMENTED; }
|
||||
// nsIStreamListener methods:
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
#else
|
||||
// nsIStreamListener
|
||||
NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType);
|
||||
@ -692,7 +692,7 @@ PluginListener::GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo)
|
||||
|
||||
NS_IMETHODIMP
|
||||
#ifdef NECKO
|
||||
PluginListener::OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
|
||||
PluginListener::OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
|
||||
#else
|
||||
PluginListener::OnDataAvailable(nsIURI* aURL, nsIInputStream* aStream,
|
||||
PRUint32 aCount)
|
||||
|
@ -1097,7 +1097,7 @@ nsParser::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *err
|
||||
* @return error code (usually 0)
|
||||
*/
|
||||
#ifdef NECKO
|
||||
nsresult nsParser::OnDataAvailable(nsISupports* aContext, nsIBufferInputStream *pIStream, PRUint32 sourceOffset, PRUint32 aLength)
|
||||
nsresult nsParser::OnDataAvailable(nsISupports* aContext, nsIInputStream *pIStream, PRUint32 sourceOffset, PRUint32 aLength)
|
||||
#else
|
||||
nsresult nsParser::OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUint32 aLength)
|
||||
#endif
|
||||
|
@ -249,7 +249,7 @@ friend class CTokenHandler;
|
||||
NS_IMETHOD OnStartRequest(nsISupports *ctxt);
|
||||
NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg);
|
||||
// nsIStreamListener methods:
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
#else
|
||||
NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo);
|
||||
NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 Progress, PRUint32 ProgressMax);
|
||||
|
@ -145,7 +145,7 @@ public:
|
||||
const PRUnichar *errorMsg) { return NS_OK; }
|
||||
|
||||
// nsIStreamListener methods:
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr,
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr,
|
||||
PRUint32 sourceOffset, PRUint32 count);
|
||||
|
||||
// nsIProgressEventSink methods:
|
||||
@ -1927,7 +1927,7 @@ nsDocumentBindInfo::OnStartBinding(nsIURI* aURL, const char *aContentType)
|
||||
|
||||
#ifdef NECKO
|
||||
NS_METHOD nsDocumentBindInfo::OnDataAvailable(nsISupports *ctxt,
|
||||
nsIBufferInputStream *aStream,
|
||||
nsIInputStream *aStream,
|
||||
PRUint32 sourceOffset,
|
||||
PRUint32 aLength)
|
||||
#else
|
||||
|
@ -145,7 +145,7 @@ public:
|
||||
const PRUnichar *errorMsg) { return NS_OK; }
|
||||
|
||||
// nsIStreamListener methods:
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr,
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr,
|
||||
PRUint32 sourceOffset, PRUint32 count);
|
||||
|
||||
// nsIProgressEventSink methods:
|
||||
@ -1927,7 +1927,7 @@ nsDocumentBindInfo::OnStartBinding(nsIURI* aURL, const char *aContentType)
|
||||
|
||||
#ifdef NECKO
|
||||
NS_METHOD nsDocumentBindInfo::OnDataAvailable(nsISupports *ctxt,
|
||||
nsIBufferInputStream *aStream,
|
||||
nsIInputStream *aStream,
|
||||
PRUint32 sourceOffset,
|
||||
PRUint32 aLength)
|
||||
#else
|
||||
|
@ -108,7 +108,7 @@ public:
|
||||
const PRUnichar *errorMsg) { return NS_OK; }
|
||||
|
||||
// nsIStreamListener
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
|
||||
#else
|
||||
// stream observer
|
||||
@ -315,7 +315,7 @@ RelatedLinksStreamListener::GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo
|
||||
NS_IMETHODIMP
|
||||
#ifdef NECKO
|
||||
RelatedLinksStreamListener::OnDataAvailable(nsISupports *ctxt,
|
||||
nsIBufferInputStream *aIStream,
|
||||
nsIInputStream *aIStream,
|
||||
PRUint32 sourceOffset,
|
||||
PRUint32 aLength)
|
||||
#else
|
||||
|
@ -217,7 +217,7 @@ nsDownloadProgressDialog::ConstructBeforeJavaScript(nsIWebShell *aWebShell) {
|
||||
|
||||
NS_IMETHODIMP
|
||||
#ifdef NECKO
|
||||
nsDownloadProgressDialog::OnDataAvailable(nsISupports* aContext, nsIBufferInputStream *aIStream,
|
||||
nsDownloadProgressDialog::OnDataAvailable(nsISupports* aContext, nsIInputStream *aIStream,
|
||||
PRUint32 offset, PRUint32 aLength)
|
||||
#else
|
||||
nsDownloadProgressDialog::OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, PRUint32 aLength)
|
||||
|
@ -55,7 +55,7 @@ public:
|
||||
NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; }
|
||||
NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; }
|
||||
// nsIStreamListener methods:
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
|
||||
#else
|
||||
NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo) { return NS_ERROR_NOT_IMPLEMENTED; }
|
||||
NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, PRUint32 aLength);
|
||||
|
@ -340,7 +340,7 @@ nsXPInstallManager::OnStopBinding(nsIURI* aURL,
|
||||
NS_IMETHODIMP
|
||||
#ifdef NECKO
|
||||
nsXPInstallManager::OnDataAvailable(nsISupports *ctxt,
|
||||
nsIBufferInputStream *pIStream,
|
||||
nsIInputStream *pIStream,
|
||||
PRUint32 sourceOffset,
|
||||
PRUint32 length)
|
||||
#else
|
||||
|
@ -72,7 +72,7 @@ class nsXPInstallManager : public nsIXPINotifier, public nsIStreamListener
|
||||
const PRUnichar *errorMsg) { return NS_OK; }
|
||||
// nsIStreamListener
|
||||
NS_IMETHOD OnDataAvailable(nsISupports *ctxt,
|
||||
nsIBufferInputStream *inStr,
|
||||
nsIInputStream *inStr,
|
||||
PRUint32 sourceOffset,
|
||||
PRUint32 count);
|
||||
#else
|
||||
|
Loading…
x
Reference in New Issue
Block a user