From 2b6605cb6666d239b903e2fae8b05092e7c9e66e Mon Sep 17 00:00:00 2001
From: "darin%netscape.com" <darin%netscape.com>
Date: Thu, 20 Apr 2006 03:37:13 +0000
Subject: [PATCH] Necko API changes, bug 74221. r=valeski, sr=rpotts.

---
 content/base/src/nsDOMParser.cpp      | 13 ++++---------
 content/base/src/nsXMLHttpRequest.cpp |  7 +++----
 content/base/src/nsXMLHttpRequest.h   |  6 ++++--
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/content/base/src/nsDOMParser.cpp b/content/base/src/nsDOMParser.cpp
index c532a274cae..9781b4a6ff7 100644
--- a/content/base/src/nsDOMParser.cpp
+++ b/content/base/src/nsDOMParser.cpp
@@ -155,11 +155,6 @@ NS_IMETHODIMP nsDOMParserChannel::GetURI(nsIURI * *aURI)
   NS_ADDREF(*aURI);
   return NS_OK;
 }
-NS_IMETHODIMP nsDOMParserChannel::SetURI(nsIURI * aURI)
-{
-  mURI = aURI;
-  return NS_OK;
-}
 
 /* attribute string contentType; */
 NS_IMETHODIMP nsDOMParserChannel::GetContentType(char * *aContentType)
@@ -202,12 +197,12 @@ NS_IMETHODIMP nsDOMParserChannel::SetOwner(nsISupports * aOwner)
   return NS_OK;
 }
 
-/* attribute nsLoadFlags loadAttributes; */
-NS_IMETHODIMP nsDOMParserChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes)
+/* attribute nsLoadFlags loadFlags; */
+NS_IMETHODIMP nsDOMParserChannel::GetLoadFlags(nsLoadFlags *aLoadFlags)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
-NS_IMETHODIMP nsDOMParserChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes)
+NS_IMETHODIMP nsDOMParserChannel::SetLoadFlags(nsLoadFlags aLoadFlags)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
@@ -464,7 +459,7 @@ nsDOMParser::ParseFromStream(nsIInputStream *stream,
     request->GetStatus(&status);
   }
 
-  rv = listener->OnStopRequest(request, nsnull, status, nsnull);
+  rv = listener->OnStopRequest(request, nsnull, status);
   if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
 
   *_retval = domDocument;
diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp
index 913c16c647b..690b123e310 100644
--- a/content/base/src/nsXMLHttpRequest.cpp
+++ b/content/base/src/nsXMLHttpRequest.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "nsXMLHttpRequest.h"
-#include "nsIStreamObserver.h"
 #include "nsISimpleEnumerator.h"
 #include "nsIHTTPHeader.h"
 #include "nsIXPConnect.h"
@@ -291,7 +290,7 @@ NS_INTERFACE_MAP_BEGIN(nsXMLHttpRequest)
    NS_INTERFACE_MAP_ENTRY(nsIXMLHttpRequest)
    NS_INTERFACE_MAP_ENTRY(nsIDOMLoadListener)
    NS_INTERFACE_MAP_ENTRY(nsISecurityCheckedComponent)
-   NS_INTERFACE_MAP_ENTRY(nsIStreamObserver)
+   NS_INTERFACE_MAP_ENTRY(nsIRequestObserver)
    NS_INTERFACE_MAP_ENTRY(nsIStreamListener)
    NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
 NS_INTERFACE_MAP_END
@@ -1099,9 +1098,9 @@ nsXMLHttpRequest::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
 
 /* void onStopRequest (in nsIRequest request, in nsISupports ctxt, in nsresult status, in wstring statusArg); */
 NS_IMETHODIMP 
-nsXMLHttpRequest::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult status, const PRUnichar *statusArg)
+nsXMLHttpRequest::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult status)
 {
-  nsresult rv = mXMLParserStreamListener->OnStopRequest(request,ctxt,status,statusArg);
+  nsresult rv = mXMLParserStreamListener->OnStopRequest(request,ctxt,status);
   mXMLParserStreamListener = nsnull;
   mReadRequest = nsnull;
   mContext = nsnull;
diff --git a/content/base/src/nsXMLHttpRequest.h b/content/base/src/nsXMLHttpRequest.h
index 09d70308061..56432809236 100644
--- a/content/base/src/nsXMLHttpRequest.h
+++ b/content/base/src/nsXMLHttpRequest.h
@@ -78,10 +78,12 @@ public:
   // nsISecurityCheckedComponent
   NS_DECL_NSISECURITYCHECKEDCOMPONENT
 
-  // nsIStreamListener & Observer
-  NS_DECL_NSISTREAMOBSERVER
+  // nsIStreamListener
   NS_DECL_NSISTREAMLISTENER
 
+  // nsIRequestObserver
+  NS_DECL_NSIREQUESTOBSERVER
+
 protected:
   nsresult MakeScriptEventListener(nsISupports* aObject,
                                    nsIDOMEventListener** aListener);