From a831f85af3a8b05c5587deaf4c54b73d0e205d4a Mon Sep 17 00:00:00 2001
From: "locka%iol.ie" <locka%iol.ie>
Date: Tue, 13 Mar 2001 13:55:30 +0000
Subject: [PATCH] Fixed wacky sync/async code in webbrowser persist b=69828,
 r=dougt@netscape.com

---
 .../webBrowser/nsWebBrowserPersist.cpp        | 31 +------------------
 .../browser/webBrowser/nsWebBrowserPersist.h  |  2 --
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/embedding/browser/webBrowser/nsWebBrowserPersist.cpp b/embedding/browser/webBrowser/nsWebBrowserPersist.cpp
index e0e04f6fee0a..32c7c75b4655 100644
--- a/embedding/browser/webBrowser/nsWebBrowserPersist.cpp
+++ b/embedding/browser/webBrowser/nsWebBrowserPersist.cpp
@@ -75,12 +75,7 @@ nsWebBrowserPersist::~nsWebBrowserPersist()
 }
 
 void nsWebBrowserPersist::CleanUp()
-{    if (mInputStream)
-    {
-        mInputStream->Close();
-        mInputStream = nsnull;
-    }
-    mInputChannel = nsnull;
+{
     if (mOutputStream)
     {
         mOutputStream->Close();
@@ -195,8 +190,6 @@ NS_IMETHODIMP nsWebBrowserPersist::SaveURI(nsIURI *aURI, nsIInputStream *aPostDa
     
     mOutputTransport = outputChannel;
     
-//dougt wtf?!  why both a async and sync read?
-
     // Read from the input channel
     rv = inputChannel->AsyncOpen(this, nsnull);
     if (NS_FAILED(rv))
@@ -204,28 +197,6 @@ NS_IMETHODIMP nsWebBrowserPersist::SaveURI(nsIURI *aURI, nsIInputStream *aPostDa
         OnEndDownload();
         return NS_ERROR_FAILURE;
     }
-    
-    nsCOMPtr<nsIInputStream> inStream;
-    rv = inputChannel->Open(getter_AddRefs(inStream));
-    if (NS_FAILED(rv))
-    {
-        OnEndDownload();
-        return NS_ERROR_FAILURE;
-    }
-  
-    mInputChannel = inputChannel;
-    mInputStream = inStream;
-
-    // Get the output channel ready for writing
-    nsCOMPtr<nsIRequest> writeRequest;
-    rv = NS_AsyncWriteFromStream(getter_AddRefs(writeRequest),
-            outputChannel, inStream, 0, 0, 0,
-            NS_STATIC_CAST(nsIStreamObserver*, this), nsnull);
-    if (NS_FAILED(rv))
-    {
-        OnEndDownload();
-        return NS_ERROR_FAILURE;
-    }
 
     return NS_OK;
 }
diff --git a/embedding/browser/webBrowser/nsWebBrowserPersist.h b/embedding/browser/webBrowser/nsWebBrowserPersist.h
index 2a20abf5a782..fedef3c985fb 100644
--- a/embedding/browser/webBrowser/nsWebBrowserPersist.h
+++ b/embedding/browser/webBrowser/nsWebBrowserPersist.h
@@ -93,8 +93,6 @@ private:
     static PRBool PR_CALLBACK CleanupURIMap(nsHashKey *aKey, void *aData, void* closure);
 
     nsCOMPtr<nsIMIMEService>  mMIMEService;
-    nsCOMPtr<nsIChannel>      mInputChannel;
-    nsCOMPtr<nsIInputStream>  mInputStream;
     nsCOMPtr<nsITransport>    mOutputTransport;
     nsCOMPtr<nsIOutputStream> mOutputStream;
     nsCOMPtr<nsIURI>          mBaseURI;