From 6a04b88f7ec79ade6a8c39129182e9754576bf01 Mon Sep 17 00:00:00 2001
From: "brade%netscape.com"
 <brade%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 8 Feb 2002 14:40:51 +0000
Subject: [PATCH] enable upload saving, use PRPackedBool (bug 120659;
 r=adamlock, sr=darin)

git-svn-id: svn://10.0.0.236/trunk@114026 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../src/nsWebBrowserPersist.h                 | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.h b/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.h
index 2c5d97ec230..c06b9ba27cf 100644
--- a/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.h
+++ b/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.h
@@ -89,9 +89,13 @@ private:
     nsresult MakeAndStoreLocalFilenameInURIMap(
         const char *aURI, PRBool aNeedsPersisting, URIData **aData);
     nsresult MakeOutputStream(
-        nsIURI *aFile, nsIChannel *aChannel, nsIOutputStream **aOutputStream);
+        nsIURI *aFile, nsIOutputStream **aOutputStream);
     nsresult MakeOutputStreamFromFile(
-        nsILocalFile *aFile, nsIChannel *aChannel, nsIOutputStream **aOutputStream);
+        nsILocalFile *aFile, nsIOutputStream **aOutputStream);
+    nsresult MakeOutputStreamFromURI(nsIURI *aURI, nsIOutputStream  **aOutStream);
+    nsresult CreateChannelFromURI(nsIURI *aURI, nsIChannel **aChannel);
+    nsresult StartUpload(nsIOutputStream *aOutStream, nsIURI *aDestinationURI,
+        const char *aContentType);
     nsresult CalculateAndAppendFileExt(nsIURI *aURI, nsIChannel *aChannel);
     nsresult MakeFilenameFromURI(
         nsIURI *aURI, nsString &aFilename);
@@ -104,7 +108,7 @@ private:
     nsresult StoreAndFixupStyleSheet(nsIStyleSheet *aStyleSheet);
     nsresult SaveDocumentWithFixup(
         nsIDocument *pDocument, nsIDocumentEncoderNodeFixup *pFixup,
-        nsIURI *aFile, PRBool aReplaceExisting, const nsString &aFormatType,
+        nsIURI *aFile, PRBool aReplaceExisting, const char *aFormatType,
         const nsString &aSaveCharset, PRUint32  aFlags);
     nsresult SaveSubframeContent(
         nsIDOMDocument *aFrameContent, URIData *aData);
@@ -125,8 +129,12 @@ private:
         nsHashKey *aKey, void *aData, void* closure);
     static PRBool PR_CALLBACK EnumCleanupOutputMap(
         nsHashKey *aKey, void *aData, void* closure);
+    static PRBool PR_CALLBACK EnumCleanupUploadList(
+        nsHashKey *aKey, void *aData, void* closure);
     static PRBool PR_CALLBACK EnumCalcProgress(
         nsHashKey *aKey, void *aData, void* closure);
+    static PRBool PR_CALLBACK EnumCalcUploadProgress(
+        nsHashKey *aKey, void *aData, void* closure);
     static PRBool PR_CALLBACK EnumFixRedirect(
         nsHashKey *aKey, void *aData, void* closure);
     static PRBool PR_CALLBACK EnumCountURIsToPersist(
@@ -142,19 +150,21 @@ private:
     nsCOMPtr<nsIURI>          mURI;
     nsCOMPtr<nsIWebProgressListener> mProgressListener;
     nsHashtable               mOutputMap;
+    nsHashtable               mUploadList;
     nsHashtable               mURIMap;
     nsVoidArray               mDocList;
     PRUint32                  mFileCounter;
     PRUint32                  mFrameCounter;
-    PRBool                    mFirstAndOnlyUse;
-    PRBool                    mCancel;
-    PRBool                    mJustStartedLoading;
-    PRBool                    mCompleted;
+    PRPackedBool              mFirstAndOnlyUse;
+    PRPackedBool              mCancel;
+    PRPackedBool              mJustStartedLoading;
+    PRPackedBool              mCompleted;
+    PRPackedBool              mStartSaving;
+    PRPackedBool              mReplaceExisting;
     PRUint32                  mPersistFlags;
     PRUint32                  mPersistResult;
     PRInt32                   mTotalCurrentProgress;
     PRInt32                   mTotalMaxProgress;
-    PRBool                    mReplaceExisting;
     PRInt16                   mWrapColumn;
     PRUint32                  mEncodingFlags;
     nsString                  mContentType;