Necko API changes, bug 74221. r=valeski, sr=rpotts.

git-svn-id: svn://10.0.0.236/trunk@91842 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%netscape.com
2001-04-10 06:01:08 +00:00
parent 8705be106d
commit 9d03c579d0
283 changed files with 2038 additions and 2126 deletions

View File

@@ -138,7 +138,7 @@ static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
static NS_DEFINE_CID(kCookieServiceCID, NS_COOKIESERVICE_CID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID);
static NS_DEFINE_IID(kIStreamObserverIID, NS_ISTREAMOBSERVER_IID);
static NS_DEFINE_IID(kIRequestObserverIID, NS_IREQUESTOBSERVER_IID);
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
static NS_DEFINE_CID(kHTTPHandlerCID, NS_IHTTPHANDLER_CID);
@@ -1001,8 +1001,8 @@ public:
// nsIProgressEventSink methods:
NS_DECL_NSIPROGRESSEVENTSINK
// nsIStreamObserver methods:
NS_DECL_NSISTREAMOBSERVER
// nsIRequestObserver methods:
NS_DECL_NSIREQUESTOBSERVER
// nsIStreamListener methods:
NS_DECL_NSISTREAMLISTENER
@@ -1070,7 +1070,7 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSISTREAMOBSERVER
NS_DECL_NSIREQUESTOBSERVER
NS_DECL_NSISTREAMLISTENER
private:
@@ -1124,8 +1124,7 @@ nsPluginCacheListener::OnDataAvailable(nsIRequest *request, nsISupports* ctxt,
NS_IMETHODIMP
nsPluginCacheListener::OnStopRequest(nsIRequest *request,
nsISupports* aContext,
nsresult aStatus,
const PRUnichar* aMsg)
nsresult aStatus)
{
return NS_OK;
}
@@ -1184,9 +1183,9 @@ nsresult nsPluginStreamListenerPeer::QueryInterface(const nsIID& aIID,
return NS_OK;
}
if (aIID.Equals(kIStreamObserverIID))
if (aIID.Equals(kIRequestObserverIID))
{
*aInstancePtrResult = (void *)((nsIStreamObserver *)this);
*aInstancePtrResult = (void *)((nsIRequestObserver *)this);
AddRef();
return NS_OK;
}
@@ -1454,8 +1453,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnDataAvailable(nsIRequest *request,
NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest(nsIRequest *request,
nsISupports* aContext,
nsresult aStatus,
const PRUnichar* aMsg)
nsresult aStatus)
{
nsresult rv = NS_OK;
nsCOMPtr<nsIURI> aURL;

View File

@@ -71,8 +71,8 @@ public:
// nsISupports
NS_DECL_ISUPPORTS
// nsIStreamObserver methods:
NS_DECL_NSISTREAMOBSERVER
// nsIRequestObserver methods:
NS_DECL_NSIREQUESTOBSERVER
// nsIStreamListener methods:
NS_DECL_NSISTREAMLISTENER
@@ -762,12 +762,12 @@ PluginListener::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
NS_IMETHODIMP
PluginListener::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
nsresult status, const PRUnichar *errorMsg)
nsresult status)
{
if (nsnull == mNextStream) {
return NS_ERROR_FAILURE;
}
return mNextStream->OnStopRequest(request, ctxt, status, errorMsg);
return mNextStream->OnStopRequest(request, ctxt, status);
}
NS_IMETHODIMP

View File

@@ -138,7 +138,7 @@ static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
static NS_DEFINE_CID(kCookieServiceCID, NS_COOKIESERVICE_CID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID);
static NS_DEFINE_IID(kIStreamObserverIID, NS_ISTREAMOBSERVER_IID);
static NS_DEFINE_IID(kIRequestObserverIID, NS_IREQUESTOBSERVER_IID);
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
static NS_DEFINE_CID(kHTTPHandlerCID, NS_IHTTPHANDLER_CID);
@@ -1001,8 +1001,8 @@ public:
// nsIProgressEventSink methods:
NS_DECL_NSIPROGRESSEVENTSINK
// nsIStreamObserver methods:
NS_DECL_NSISTREAMOBSERVER
// nsIRequestObserver methods:
NS_DECL_NSIREQUESTOBSERVER
// nsIStreamListener methods:
NS_DECL_NSISTREAMLISTENER
@@ -1070,7 +1070,7 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSISTREAMOBSERVER
NS_DECL_NSIREQUESTOBSERVER
NS_DECL_NSISTREAMLISTENER
private:
@@ -1124,8 +1124,7 @@ nsPluginCacheListener::OnDataAvailable(nsIRequest *request, nsISupports* ctxt,
NS_IMETHODIMP
nsPluginCacheListener::OnStopRequest(nsIRequest *request,
nsISupports* aContext,
nsresult aStatus,
const PRUnichar* aMsg)
nsresult aStatus)
{
return NS_OK;
}
@@ -1184,9 +1183,9 @@ nsresult nsPluginStreamListenerPeer::QueryInterface(const nsIID& aIID,
return NS_OK;
}
if (aIID.Equals(kIStreamObserverIID))
if (aIID.Equals(kIRequestObserverIID))
{
*aInstancePtrResult = (void *)((nsIStreamObserver *)this);
*aInstancePtrResult = (void *)((nsIRequestObserver *)this);
AddRef();
return NS_OK;
}
@@ -1454,8 +1453,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnDataAvailable(nsIRequest *request,
NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest(nsIRequest *request,
nsISupports* aContext,
nsresult aStatus,
const PRUnichar* aMsg)
nsresult aStatus)
{
nsresult rv = NS_OK;
nsCOMPtr<nsIURI> aURL;

View File

@@ -71,8 +71,8 @@ public:
// nsISupports
NS_DECL_ISUPPORTS
// nsIStreamObserver methods:
NS_DECL_NSISTREAMOBSERVER
// nsIRequestObserver methods:
NS_DECL_NSIREQUESTOBSERVER
// nsIStreamListener methods:
NS_DECL_NSISTREAMLISTENER
@@ -762,12 +762,12 @@ PluginListener::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
NS_IMETHODIMP
PluginListener::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
nsresult status, const PRUnichar *errorMsg)
nsresult status)
{
if (nsnull == mNextStream) {
return NS_ERROR_FAILURE;
}
return mNextStream->OnStopRequest(request, ctxt, status, errorMsg);
return mNextStream->OnStopRequest(request, ctxt, status);
}
NS_IMETHODIMP