diff --git a/mozilla/content/base/public/nsIDocument.h b/mozilla/content/base/public/nsIDocument.h index 958e17fd420..67032c4f60c 100644 --- a/mozilla/content/base/public/nsIDocument.h +++ b/mozilla/content/base/public/nsIDocument.h @@ -65,6 +65,7 @@ class nsIChannel; { 0x152ab6e0, 0xff13, 0x11d1, \ {0xbe, 0xb9, 0x00, 0x80, 0x5f, 0x8a, 0x66, 0xdc} } +#if 0 class nsIPostData : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IPOSTDATA_IID; return iid; } @@ -73,6 +74,7 @@ public: virtual const char* GetData() = 0; // get the file name or raw data virtual PRInt32 GetDataLength() = 0; }; +#endif //---------------------------------------------------------------------- @@ -321,7 +323,9 @@ extern NS_LAYOUT nsresult // Note: The buffer passed into NewPostData(...) becomes owned by the IPostData // instance and is freed when the instance is destroyed... // +#if 0 extern NS_LAYOUT nsresult NS_NewPostData(PRBool aIsFile, char *aData, nsIPostData** aInstancePtrResult); +#endif #endif /* nsIDocument_h___ */ diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index ba773ddf713..a052b300605 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -498,6 +498,7 @@ nsDOMImplementation::SetScriptObject(void *aScriptObject) // = // ================================================================== +#if 0 NS_LAYOUT nsresult NS_NewPostData(PRBool aIsFile, char* aData, nsIPostData** aInstancePtrResult) @@ -517,8 +518,9 @@ NS_NewPostData(PRBool aIsFile, char* aData, return rv; } +#endif - +#if 0 // nuking postdata nsPostData::nsPostData(PRBool aIsFile, char* aData) { NS_INIT_REFCNT(); @@ -561,6 +563,7 @@ PRInt32 nsPostData::GetDataLength() { return mDataLen; } +#endif // nuking postdata. // ================================================================== // = diff --git a/mozilla/content/base/src/nsDocument.h b/mozilla/content/base/src/nsDocument.h index 31611b20829..518b7214f39 100644 --- a/mozilla/content/base/src/nsDocument.h +++ b/mozilla/content/base/src/nsDocument.h @@ -37,6 +37,7 @@ class nsDOMStyleSheetCollection; class nsIOutputStream; class nsDocument; +#if 0 class nsPostData : public nsIPostData { public: nsPostData(PRBool aIsFile, char* aData); @@ -54,6 +55,7 @@ protected: char* mData; PRInt32 mDataLen; }; +#endif class nsDocHeaderData { diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 2f893d6cf4d..2e1e8cb2379 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -223,7 +223,7 @@ public: // Document load api's NS_IMETHOD GetDocumentLoader(nsIDocumentLoader*& aResult); NS_IMETHOD LoadURL(const PRUnichar *aURLSpec, - nsIPostData* aPostData=nsnull, + nsIInputStream* aPostDataStream=nsnull, PRBool aModifyHistory=PR_TRUE, #ifdef NECKO nsLoadFlags aType = nsIChannel::LOAD_NORMAL, @@ -233,7 +233,7 @@ public: const PRUint32 localIP = 0); NS_IMETHOD LoadURL(const PRUnichar *aURLSpec, const char* aCommand, - nsIPostData* aPostData=nsnull, + nsIInputStream* aPostDataStream=nsnull, PRBool aModifyHistory=PR_TRUE, #ifdef NECKO nsLoadFlags aType = nsIChannel::LOAD_NORMAL, @@ -294,7 +294,7 @@ public: nsLinkVerb aVerb, const PRUnichar* aURLSpec, const PRUnichar* aTargetSpec, - nsIPostData* aPostData = 0); + nsIInputStream* aPostDataStream = 0); NS_IMETHOD OnOverLink(nsIContent* aContent, const PRUnichar* aURLSpec, const PRUnichar* aTargetSpec); @@ -410,7 +410,7 @@ public: nsLinkVerb aVerb, const PRUnichar* aURLSpec, const PRUnichar* aTargetSpec, - nsIPostData* aPostDat = 0); + nsIInputStream* aPostDataStream = 0); void ShowHistory(); @@ -500,7 +500,7 @@ protected: nsresult CreateScriptEnvironment(); nsresult DoLoadURL(const nsString& aUrlSpec, const char* aCommand, - nsIPostData* aPostData, + nsIInputStream* aPostDataStream, #ifdef NECKO nsLoadFlags aType, #else @@ -1778,7 +1778,7 @@ static void convertFileToURL(const nsString &aIn, nsString &aOut) NS_IMETHODIMP nsWebShell::LoadURL(const PRUnichar *aURLSpec, - nsIPostData* aPostData, + nsIInputStream* aPostDataStream, PRBool aModifyHistory, #ifdef NECKO nsLoadFlags aType, @@ -1791,7 +1791,8 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec, // before the last document was loaded. InitFrameData(PR_FALSE); - return LoadURL(aURLSpec,"view",aPostData,aModifyHistory,aType, aLocalIP); + return LoadURL(aURLSpec, "view", aPostDataStream, + aModifyHistory,aType, aLocalIP); } // Nisheeth: returns true if the host and the file parts of @@ -1832,7 +1833,7 @@ static PRBool EqualBaseURLs(nsIURI* url1, nsIURI* url2) nsresult nsWebShell::DoLoadURL(const nsString& aUrlSpec, const char* aCommand, - nsIPostData* aPostData, + nsIInputStream* aPostDataStream, #ifdef NECKO nsLoadFlags aType, #else @@ -1847,10 +1848,10 @@ nsWebShell::DoLoadURL(const nsString& aUrlSpec, // and see if it's an element within the current document #ifdef NECKO if ((aType == nsIChannel::LOAD_NORMAL) && (nsnull != mContentViewer) && - (nsnull == aPostData)) + (nsnull == aPostDataStream)) #else if ((aType == nsURLReload || aType == nsURLReloadFromHistory) && - (nsnull != mContentViewer) && (nsnull == aPostData)) + (nsnull != mContentViewer) && (nsnull == aPostDataStream)) #endif { nsCOMPtr docViewer; @@ -1947,20 +1948,20 @@ nsWebShell::DoLoadURL(const nsString& aUrlSpec, * - Radha */ - return mDocLoader->LoadDocument(aUrlSpec, // URL string - aCommand, // Command - this, // Container - aPostData, // Post Data - nsnull, // Extra Info... - mObserver, // Observer - aType, // reload type - aLocalIP); // load attributes. + return mDocLoader->LoadDocument(aUrlSpec, // URL string + aCommand, // Command + this, // Container + aPostDataStream, // Post Data + nsnull, // Extra Info... + mObserver, // Observer + aType, // reload type + aLocalIP); // load attributes. } NS_IMETHODIMP nsWebShell::LoadURL(const PRUnichar *aURLSpec, const char* aCommand, - nsIPostData* aPostData, + nsIInputStream* aPostDataStream, PRBool aModifyHistory, #ifdef NECKO nsLoadFlags aType, @@ -2050,7 +2051,8 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec, res = GetUrlDispatcher(*getter_AddRefs(urlDispatcher)); if (NS_SUCCEEDED(res) && urlDispatcher) { printf("calling HandleUrl\n"); - urlDispatcher->HandleUrl(LinkCommand.GetUnicode(), urlSpec.GetUnicode(), aPostData); + urlDispatcher->HandleUrl(LinkCommand.GetUnicode(), + urlSpec.GetUnicode(), aPostDataStream); return NS_OK; } } @@ -2118,7 +2120,7 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec, GetURL(&urlString); nsAutoString newURL(urlString); - return DoLoadURL(newURL, aCommand, aPostData, aType, aLocalIP); + return DoLoadURL(newURL, aCommand, aPostDataStream, aType, aLocalIP); //#endif } @@ -2535,19 +2537,20 @@ nsWebShell::SetRendering(PRBool aRender) struct OnLinkClickEvent : public PLEvent { OnLinkClickEvent(nsWebShell* aHandler, nsIContent* aContent, nsLinkVerb aVerb, const PRUnichar* aURLSpec, - const PRUnichar* aTargetSpec, nsIPostData* aPostData = 0); + const PRUnichar* aTargetSpec, nsIInputStream* aPostDataStream = 0); ~OnLinkClickEvent(); void HandleEvent() { - mHandler->HandleLinkClickEvent(mContent, mVerb, mURLSpec->GetUnicode(), mTargetSpec->GetUnicode(), mPostData); + mHandler->HandleLinkClickEvent(mContent, mVerb, mURLSpec->GetUnicode(), + mTargetSpec->GetUnicode(), mPostDataStream); } nsWebShell* mHandler; nsString* mURLSpec; nsString* mTargetSpec; - nsIPostData* mPostData; - nsIContent* mContent; - nsLinkVerb mVerb; + nsIInputStream* mPostDataStream; + nsIContent* mContent; + nsLinkVerb mVerb; }; static void PR_CALLBACK HandlePLEvent(OnLinkClickEvent* aEvent) @@ -2565,7 +2568,7 @@ OnLinkClickEvent::OnLinkClickEvent(nsWebShell* aHandler, nsLinkVerb aVerb, const PRUnichar* aURLSpec, const PRUnichar* aTargetSpec, - nsIPostData* aPostData) + nsIInputStream* aPostDataStream) { nsIEventQueue* eventQueue; @@ -2573,8 +2576,8 @@ OnLinkClickEvent::OnLinkClickEvent(nsWebShell* aHandler, NS_ADDREF(aHandler); mURLSpec = new nsString(aURLSpec); mTargetSpec = new nsString(aTargetSpec); - mPostData = aPostData; - NS_IF_ADDREF(mPostData); + mPostDataStream = aPostDataStream; + NS_IF_ADDREF(mPostDataStream); mContent = aContent; NS_IF_ADDREF(mContent); mVerb = aVerb; @@ -2592,7 +2595,7 @@ OnLinkClickEvent::~OnLinkClickEvent() { NS_IF_RELEASE(mContent); NS_IF_RELEASE(mHandler); - NS_IF_RELEASE(mPostData); + NS_IF_RELEASE(mPostDataStream); if (nsnull != mURLSpec) delete mURLSpec; if (nsnull != mTargetSpec) delete mTargetSpec; @@ -2605,13 +2608,13 @@ nsWebShell::OnLinkClick(nsIContent* aContent, nsLinkVerb aVerb, const PRUnichar* aURLSpec, const PRUnichar* aTargetSpec, - nsIPostData* aPostData) + nsIInputStream* aPostDataStream) { OnLinkClickEvent* ev; nsresult rv = NS_OK; ev = new OnLinkClickEvent(this, aContent, aVerb, aURLSpec, - aTargetSpec, aPostData); + aTargetSpec, aPostDataStream); if (nsnull == ev) { rv = NS_ERROR_OUT_OF_MEMORY; } @@ -2699,7 +2702,7 @@ nsWebShell::HandleLinkClickEvent(nsIContent *aContent, nsLinkVerb aVerb, const PRUnichar* aURLSpec, const PRUnichar* aTargetSpec, - nsIPostData* aPostData) + nsIInputStream* aPostDataStream) { nsAutoString target(aTargetSpec); @@ -2711,7 +2714,7 @@ nsWebShell::HandleLinkClickEvent(nsIContent *aContent, { nsIWebShell* shell = GetTarget(target.GetUnicode()); if (nsnull != shell) { - (void)shell->LoadURL(aURLSpec, aPostData); + (void)shell->LoadURL(aURLSpec, aPostDataStream); NS_RELEASE(shell); } } diff --git a/mozilla/layout/base/public/nsIDocument.h b/mozilla/layout/base/public/nsIDocument.h index 958e17fd420..67032c4f60c 100644 --- a/mozilla/layout/base/public/nsIDocument.h +++ b/mozilla/layout/base/public/nsIDocument.h @@ -65,6 +65,7 @@ class nsIChannel; { 0x152ab6e0, 0xff13, 0x11d1, \ {0xbe, 0xb9, 0x00, 0x80, 0x5f, 0x8a, 0x66, 0xdc} } +#if 0 class nsIPostData : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IPOSTDATA_IID; return iid; } @@ -73,6 +74,7 @@ public: virtual const char* GetData() = 0; // get the file name or raw data virtual PRInt32 GetDataLength() = 0; }; +#endif //---------------------------------------------------------------------- @@ -321,7 +323,9 @@ extern NS_LAYOUT nsresult // Note: The buffer passed into NewPostData(...) becomes owned by the IPostData // instance and is freed when the instance is destroyed... // +#if 0 extern NS_LAYOUT nsresult NS_NewPostData(PRBool aIsFile, char *aData, nsIPostData** aInstancePtrResult); +#endif #endif /* nsIDocument_h___ */ diff --git a/mozilla/layout/base/src/nsDocument.cpp b/mozilla/layout/base/src/nsDocument.cpp index ba773ddf713..a052b300605 100644 --- a/mozilla/layout/base/src/nsDocument.cpp +++ b/mozilla/layout/base/src/nsDocument.cpp @@ -498,6 +498,7 @@ nsDOMImplementation::SetScriptObject(void *aScriptObject) // = // ================================================================== +#if 0 NS_LAYOUT nsresult NS_NewPostData(PRBool aIsFile, char* aData, nsIPostData** aInstancePtrResult) @@ -517,8 +518,9 @@ NS_NewPostData(PRBool aIsFile, char* aData, return rv; } +#endif - +#if 0 // nuking postdata nsPostData::nsPostData(PRBool aIsFile, char* aData) { NS_INIT_REFCNT(); @@ -561,6 +563,7 @@ PRInt32 nsPostData::GetDataLength() { return mDataLen; } +#endif // nuking postdata. // ================================================================== // = diff --git a/mozilla/layout/base/src/nsDocument.h b/mozilla/layout/base/src/nsDocument.h index 31611b20829..518b7214f39 100644 --- a/mozilla/layout/base/src/nsDocument.h +++ b/mozilla/layout/base/src/nsDocument.h @@ -37,6 +37,7 @@ class nsDOMStyleSheetCollection; class nsIOutputStream; class nsDocument; +#if 0 class nsPostData : public nsIPostData { public: nsPostData(PRBool aIsFile, char* aData); @@ -54,6 +55,7 @@ protected: char* mData; PRInt32 mDataLen; }; +#endif class nsDocHeaderData { diff --git a/mozilla/layout/html/forms/src/nsFormFrame.cpp b/mozilla/layout/html/forms/src/nsFormFrame.cpp index 00b7aa8d6d4..5ca5153b3d6 100644 --- a/mozilla/layout/html/forms/src/nsFormFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFormFrame.cpp @@ -502,21 +502,25 @@ nsFormFrame::OnSubmit(nsIPresContext* aPresContext, nsIFrame* aFrame) if (NS_FAILED(result)) return result; // Now pass on absolute url to the click handler - nsIPostData* postData = nsnull; + nsIInputStream* postDataStream = nsnull; if (isPost) { nsresult rv; char* postBuffer = data.ToNewCString(); - rv = NS_NewPostData(!isURLEncoded, postBuffer, &postData); + rv = NS_NewPostDataStream(!isURLEncoded, postBuffer, 0, &postDataStream); + if (NS_OK != rv) { delete [] postBuffer; } /* The postBuffer is now owned by the IPostData instance */ } - if (handler) - handler->OnLinkClick(mContent, eLinkVerb_Replace, absURLSpec.GetUnicode(), target.GetUnicode(), postData); - NS_IF_RELEASE(postData); + if (handler) { + handler->OnLinkClick(mContent, eLinkVerb_Replace, + absURLSpec.GetUnicode(), + target.GetUnicode(), postDataStream); + } + NS_IF_RELEASE(postDataStream); NS_IF_RELEASE(handler); DebugPrint("url", absURLSpec); diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp index c22b51dac20..f579649dd5b 100644 --- a/mozilla/uriloader/base/nsDocLoader.cpp +++ b/mozilla/uriloader/base/nsDocLoader.cpp @@ -36,7 +36,7 @@ #include "nsIURLGroup.h" #include "nsILoadAttribs.h" #include "nsINetService.h" -#include "nsIPostToServer.h" +//#include "nsIPostToServer.h" #else #include "nsIIOService.h" #include "nsILoadGroup.h" @@ -129,7 +129,7 @@ public: NS_DECL_ISUPPORTS nsresult Bind(const nsString& aURLSpec, - nsIPostData* aPostData, + nsIInputStream* aPostDataStream, nsIStreamListener* aListener); nsresult Bind(nsIURI* aURL, nsIStreamListener* aListener); @@ -209,7 +209,7 @@ public: NS_IMETHOD LoadDocument(const nsString& aURLSpec, const char *aCommand, nsIContentViewerContainer* aContainer, - nsIPostData* aPostData = nsnull, + nsIInputStream* aPostDataStream = nsnull, nsISupports* aExtraInfo = nsnull, nsIStreamObserver* anObserver = nsnull, #ifdef NECKO @@ -591,7 +591,7 @@ NS_IMETHODIMP nsDocLoaderImpl::LoadDocument(const nsString& aURLSpec, const char* aCommand, nsIContentViewerContainer* aContainer, - nsIPostData* aPostData, + nsIInputStream* aPostDataStream, nsISupports* aExtraInfo, nsIStreamObserver* anObserver, #ifdef NECKO @@ -670,7 +670,7 @@ nsDocLoaderImpl::LoadDocument(const nsString& aURLSpec, mStreamObserver = dont_QueryInterface(anObserver); - rv = loader->Bind(aURLSpec, aPostData, nsnull); + rv = loader->Bind(aURLSpec, aPostDataStream, nsnull); done: NS_RELEASE(loader); @@ -1564,7 +1564,7 @@ nsDocumentBindInfo::QueryInterface(const nsIID& aIID, } nsresult nsDocumentBindInfo::Bind(const nsString& aURLSpec, - nsIPostData* aPostData, + nsIInputStream* aPostDataStream, nsIStreamListener* aListener) { nsresult rv; @@ -1581,9 +1581,12 @@ nsresult nsDocumentBindInfo::Bind(const nsString& aURLSpec, } /* Store any POST data into the URL */ - if (nsnull != aPostData) { + if (nsnull != aPostDataStream) { #ifdef NECKO NS_ASSERTION(0, "FIX ME"); + + + #else static NS_DEFINE_IID(kPostToServerIID, NS_IPOSTTOSERVER_IID); nsIPostToServer* pts; diff --git a/mozilla/webshell/public/nsIDocumentLoader.h b/mozilla/webshell/public/nsIDocumentLoader.h index bd81cec1edd..92c44b04981 100644 --- a/mozilla/webshell/public/nsIDocumentLoader.h +++ b/mozilla/webshell/public/nsIDocumentLoader.h @@ -105,7 +105,7 @@ public: NS_IMETHOD LoadDocument(const nsString& aURLSpec, const char* aCommand, nsIContentViewerContainer* aContainer, - nsIPostData* aPostData = nsnull, + nsIInputStream* aPostDataStream = nsnull, nsISupports* aExtraInfo = nsnull, nsIStreamObserver* anObserver = nsnull, #ifdef NECKO diff --git a/mozilla/webshell/public/nsILinkHandler.h b/mozilla/webshell/public/nsILinkHandler.h index 1f51ddff438..76c26e9e4a4 100644 --- a/mozilla/webshell/public/nsILinkHandler.h +++ b/mozilla/webshell/public/nsILinkHandler.h @@ -22,7 +22,7 @@ #include "nsweb.h" #include "nsISupports.h" -class nsIPostData; +class nsIInputStream; class nsIContent; struct nsGUIEvent; @@ -63,7 +63,7 @@ public: nsLinkVerb aVerb, const PRUnichar* aURLSpec, const PRUnichar* aTargetSpec, - nsIPostData* aPostData = 0) = 0; + nsIInputStream* aPostDataStream = 0) = 0; /** * Process a mouse-over a link. aContent is the diff --git a/mozilla/webshell/public/nsIUrlDispatcher.h b/mozilla/webshell/public/nsIUrlDispatcher.h index 8ebd2b15bc9..3585102a59e 100644 --- a/mozilla/webshell/public/nsIUrlDispatcher.h +++ b/mozilla/webshell/public/nsIUrlDispatcher.h @@ -37,11 +37,12 @@ public: NS_DEFINE_STATIC_IID_ACCESSOR(NS_IURLDISPATCHER_IID) - NS_IMETHOD HandleUrl(const PRUnichar * aCommand, const PRUnichar * aURLSpec, nsIPostData * aPostData)=0; + NS_IMETHOD HandleUrl(const PRUnichar * aCommand, const PRUnichar * aURLSpec, + nsIInputStream * aPostDataStream) = 0; }; #define NS_DECL_IURLDISPATCHER \ - NS_IMETHOD HandleUrl(const PRUnichar *, const PRUnichar *, nsIPostData *); \ + NS_IMETHOD HandleUrl(const PRUnichar *, const PRUnichar *, nsIInputStream *); \ #endif /* nsIUrlDispatcher_h___ */ diff --git a/mozilla/webshell/public/nsIWebShell.h b/mozilla/webshell/public/nsIWebShell.h index e3007fba3f8..9c0d6fbd081 100644 --- a/mozilla/webshell/public/nsIWebShell.h +++ b/mozilla/webshell/public/nsIWebShell.h @@ -36,7 +36,7 @@ class nsIDOMElement; class nsIDOMWindow; class nsIFactory; -class nsIPostData; +//class nsIPostData; class nsIStreamObserver; class nsIDocumentLoader; class nsIDocumentLoaderObserver; @@ -340,7 +340,7 @@ public: * Load the document associated with the specified URL into the WebShell. */ NS_IMETHOD LoadURL(const PRUnichar *aURLSpec, - nsIPostData* aPostData=nsnull, + nsIInputStream* aPostDataStream=nsnull, PRBool aModifyHistory=PR_TRUE, #ifdef NECKO nsLoadFlags aType = nsIChannel::LOAD_NORMAL, @@ -354,7 +354,7 @@ public: */ NS_IMETHOD LoadURL(const PRUnichar *aURLSpec, const char* aCommand, - nsIPostData* aPostData=nsnull, + nsIInputStream* aPostDataStream=nsnull, PRBool aModifyHistory=PR_TRUE, #ifdef NECKO nsLoadFlags aType = nsIChannel::LOAD_NORMAL, diff --git a/mozilla/webshell/src/nsDocLoader.cpp b/mozilla/webshell/src/nsDocLoader.cpp index c22b51dac20..f579649dd5b 100644 --- a/mozilla/webshell/src/nsDocLoader.cpp +++ b/mozilla/webshell/src/nsDocLoader.cpp @@ -36,7 +36,7 @@ #include "nsIURLGroup.h" #include "nsILoadAttribs.h" #include "nsINetService.h" -#include "nsIPostToServer.h" +//#include "nsIPostToServer.h" #else #include "nsIIOService.h" #include "nsILoadGroup.h" @@ -129,7 +129,7 @@ public: NS_DECL_ISUPPORTS nsresult Bind(const nsString& aURLSpec, - nsIPostData* aPostData, + nsIInputStream* aPostDataStream, nsIStreamListener* aListener); nsresult Bind(nsIURI* aURL, nsIStreamListener* aListener); @@ -209,7 +209,7 @@ public: NS_IMETHOD LoadDocument(const nsString& aURLSpec, const char *aCommand, nsIContentViewerContainer* aContainer, - nsIPostData* aPostData = nsnull, + nsIInputStream* aPostDataStream = nsnull, nsISupports* aExtraInfo = nsnull, nsIStreamObserver* anObserver = nsnull, #ifdef NECKO @@ -591,7 +591,7 @@ NS_IMETHODIMP nsDocLoaderImpl::LoadDocument(const nsString& aURLSpec, const char* aCommand, nsIContentViewerContainer* aContainer, - nsIPostData* aPostData, + nsIInputStream* aPostDataStream, nsISupports* aExtraInfo, nsIStreamObserver* anObserver, #ifdef NECKO @@ -670,7 +670,7 @@ nsDocLoaderImpl::LoadDocument(const nsString& aURLSpec, mStreamObserver = dont_QueryInterface(anObserver); - rv = loader->Bind(aURLSpec, aPostData, nsnull); + rv = loader->Bind(aURLSpec, aPostDataStream, nsnull); done: NS_RELEASE(loader); @@ -1564,7 +1564,7 @@ nsDocumentBindInfo::QueryInterface(const nsIID& aIID, } nsresult nsDocumentBindInfo::Bind(const nsString& aURLSpec, - nsIPostData* aPostData, + nsIInputStream* aPostDataStream, nsIStreamListener* aListener) { nsresult rv; @@ -1581,9 +1581,12 @@ nsresult nsDocumentBindInfo::Bind(const nsString& aURLSpec, } /* Store any POST data into the URL */ - if (nsnull != aPostData) { + if (nsnull != aPostDataStream) { #ifdef NECKO NS_ASSERTION(0, "FIX ME"); + + + #else static NS_DEFINE_IID(kPostToServerIID, NS_IPOSTTOSERVER_IID); nsIPostToServer* pts; diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 2f893d6cf4d..2e1e8cb2379 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -223,7 +223,7 @@ public: // Document load api's NS_IMETHOD GetDocumentLoader(nsIDocumentLoader*& aResult); NS_IMETHOD LoadURL(const PRUnichar *aURLSpec, - nsIPostData* aPostData=nsnull, + nsIInputStream* aPostDataStream=nsnull, PRBool aModifyHistory=PR_TRUE, #ifdef NECKO nsLoadFlags aType = nsIChannel::LOAD_NORMAL, @@ -233,7 +233,7 @@ public: const PRUint32 localIP = 0); NS_IMETHOD LoadURL(const PRUnichar *aURLSpec, const char* aCommand, - nsIPostData* aPostData=nsnull, + nsIInputStream* aPostDataStream=nsnull, PRBool aModifyHistory=PR_TRUE, #ifdef NECKO nsLoadFlags aType = nsIChannel::LOAD_NORMAL, @@ -294,7 +294,7 @@ public: nsLinkVerb aVerb, const PRUnichar* aURLSpec, const PRUnichar* aTargetSpec, - nsIPostData* aPostData = 0); + nsIInputStream* aPostDataStream = 0); NS_IMETHOD OnOverLink(nsIContent* aContent, const PRUnichar* aURLSpec, const PRUnichar* aTargetSpec); @@ -410,7 +410,7 @@ public: nsLinkVerb aVerb, const PRUnichar* aURLSpec, const PRUnichar* aTargetSpec, - nsIPostData* aPostDat = 0); + nsIInputStream* aPostDataStream = 0); void ShowHistory(); @@ -500,7 +500,7 @@ protected: nsresult CreateScriptEnvironment(); nsresult DoLoadURL(const nsString& aUrlSpec, const char* aCommand, - nsIPostData* aPostData, + nsIInputStream* aPostDataStream, #ifdef NECKO nsLoadFlags aType, #else @@ -1778,7 +1778,7 @@ static void convertFileToURL(const nsString &aIn, nsString &aOut) NS_IMETHODIMP nsWebShell::LoadURL(const PRUnichar *aURLSpec, - nsIPostData* aPostData, + nsIInputStream* aPostDataStream, PRBool aModifyHistory, #ifdef NECKO nsLoadFlags aType, @@ -1791,7 +1791,8 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec, // before the last document was loaded. InitFrameData(PR_FALSE); - return LoadURL(aURLSpec,"view",aPostData,aModifyHistory,aType, aLocalIP); + return LoadURL(aURLSpec, "view", aPostDataStream, + aModifyHistory,aType, aLocalIP); } // Nisheeth: returns true if the host and the file parts of @@ -1832,7 +1833,7 @@ static PRBool EqualBaseURLs(nsIURI* url1, nsIURI* url2) nsresult nsWebShell::DoLoadURL(const nsString& aUrlSpec, const char* aCommand, - nsIPostData* aPostData, + nsIInputStream* aPostDataStream, #ifdef NECKO nsLoadFlags aType, #else @@ -1847,10 +1848,10 @@ nsWebShell::DoLoadURL(const nsString& aUrlSpec, // and see if it's an element within the current document #ifdef NECKO if ((aType == nsIChannel::LOAD_NORMAL) && (nsnull != mContentViewer) && - (nsnull == aPostData)) + (nsnull == aPostDataStream)) #else if ((aType == nsURLReload || aType == nsURLReloadFromHistory) && - (nsnull != mContentViewer) && (nsnull == aPostData)) + (nsnull != mContentViewer) && (nsnull == aPostDataStream)) #endif { nsCOMPtr docViewer; @@ -1947,20 +1948,20 @@ nsWebShell::DoLoadURL(const nsString& aUrlSpec, * - Radha */ - return mDocLoader->LoadDocument(aUrlSpec, // URL string - aCommand, // Command - this, // Container - aPostData, // Post Data - nsnull, // Extra Info... - mObserver, // Observer - aType, // reload type - aLocalIP); // load attributes. + return mDocLoader->LoadDocument(aUrlSpec, // URL string + aCommand, // Command + this, // Container + aPostDataStream, // Post Data + nsnull, // Extra Info... + mObserver, // Observer + aType, // reload type + aLocalIP); // load attributes. } NS_IMETHODIMP nsWebShell::LoadURL(const PRUnichar *aURLSpec, const char* aCommand, - nsIPostData* aPostData, + nsIInputStream* aPostDataStream, PRBool aModifyHistory, #ifdef NECKO nsLoadFlags aType, @@ -2050,7 +2051,8 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec, res = GetUrlDispatcher(*getter_AddRefs(urlDispatcher)); if (NS_SUCCEEDED(res) && urlDispatcher) { printf("calling HandleUrl\n"); - urlDispatcher->HandleUrl(LinkCommand.GetUnicode(), urlSpec.GetUnicode(), aPostData); + urlDispatcher->HandleUrl(LinkCommand.GetUnicode(), + urlSpec.GetUnicode(), aPostDataStream); return NS_OK; } } @@ -2118,7 +2120,7 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec, GetURL(&urlString); nsAutoString newURL(urlString); - return DoLoadURL(newURL, aCommand, aPostData, aType, aLocalIP); + return DoLoadURL(newURL, aCommand, aPostDataStream, aType, aLocalIP); //#endif } @@ -2535,19 +2537,20 @@ nsWebShell::SetRendering(PRBool aRender) struct OnLinkClickEvent : public PLEvent { OnLinkClickEvent(nsWebShell* aHandler, nsIContent* aContent, nsLinkVerb aVerb, const PRUnichar* aURLSpec, - const PRUnichar* aTargetSpec, nsIPostData* aPostData = 0); + const PRUnichar* aTargetSpec, nsIInputStream* aPostDataStream = 0); ~OnLinkClickEvent(); void HandleEvent() { - mHandler->HandleLinkClickEvent(mContent, mVerb, mURLSpec->GetUnicode(), mTargetSpec->GetUnicode(), mPostData); + mHandler->HandleLinkClickEvent(mContent, mVerb, mURLSpec->GetUnicode(), + mTargetSpec->GetUnicode(), mPostDataStream); } nsWebShell* mHandler; nsString* mURLSpec; nsString* mTargetSpec; - nsIPostData* mPostData; - nsIContent* mContent; - nsLinkVerb mVerb; + nsIInputStream* mPostDataStream; + nsIContent* mContent; + nsLinkVerb mVerb; }; static void PR_CALLBACK HandlePLEvent(OnLinkClickEvent* aEvent) @@ -2565,7 +2568,7 @@ OnLinkClickEvent::OnLinkClickEvent(nsWebShell* aHandler, nsLinkVerb aVerb, const PRUnichar* aURLSpec, const PRUnichar* aTargetSpec, - nsIPostData* aPostData) + nsIInputStream* aPostDataStream) { nsIEventQueue* eventQueue; @@ -2573,8 +2576,8 @@ OnLinkClickEvent::OnLinkClickEvent(nsWebShell* aHandler, NS_ADDREF(aHandler); mURLSpec = new nsString(aURLSpec); mTargetSpec = new nsString(aTargetSpec); - mPostData = aPostData; - NS_IF_ADDREF(mPostData); + mPostDataStream = aPostDataStream; + NS_IF_ADDREF(mPostDataStream); mContent = aContent; NS_IF_ADDREF(mContent); mVerb = aVerb; @@ -2592,7 +2595,7 @@ OnLinkClickEvent::~OnLinkClickEvent() { NS_IF_RELEASE(mContent); NS_IF_RELEASE(mHandler); - NS_IF_RELEASE(mPostData); + NS_IF_RELEASE(mPostDataStream); if (nsnull != mURLSpec) delete mURLSpec; if (nsnull != mTargetSpec) delete mTargetSpec; @@ -2605,13 +2608,13 @@ nsWebShell::OnLinkClick(nsIContent* aContent, nsLinkVerb aVerb, const PRUnichar* aURLSpec, const PRUnichar* aTargetSpec, - nsIPostData* aPostData) + nsIInputStream* aPostDataStream) { OnLinkClickEvent* ev; nsresult rv = NS_OK; ev = new OnLinkClickEvent(this, aContent, aVerb, aURLSpec, - aTargetSpec, aPostData); + aTargetSpec, aPostDataStream); if (nsnull == ev) { rv = NS_ERROR_OUT_OF_MEMORY; } @@ -2699,7 +2702,7 @@ nsWebShell::HandleLinkClickEvent(nsIContent *aContent, nsLinkVerb aVerb, const PRUnichar* aURLSpec, const PRUnichar* aTargetSpec, - nsIPostData* aPostData) + nsIInputStream* aPostDataStream) { nsAutoString target(aTargetSpec); @@ -2711,7 +2714,7 @@ nsWebShell::HandleLinkClickEvent(nsIContent *aContent, { nsIWebShell* shell = GetTarget(target.GetUnicode()); if (nsnull != shell) { - (void)shell->LoadURL(aURLSpec, aPostData); + (void)shell->LoadURL(aURLSpec, aPostDataStream); NS_RELEASE(shell); } } diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp index c674f9450b5..0ffb4709e43 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp @@ -2708,7 +2708,9 @@ nsWebShellWindow::ShowMenuBar(PRBool aShow) //nsIUrlDispatcher methods NS_IMETHODIMP -nsWebShellWindow::HandleUrl(const PRUnichar * aCommand, const PRUnichar * aURLSpec, nsIPostData * aPostData) +nsWebShellWindow::HandleUrl(const PRUnichar * aCommand, + const PRUnichar * aURLSpec, + nsIInputStream * aPostDataStream) { /* Make the topic to observe. The topic will be of the format * linkclick:. Note thet this is a totally made up thing.