Removed all the LoadURL methods from the webshell API. Added a new API to allow loading for the old session history. This is needed until the new session history is online.

docshell/base/nsWebShell.cpp

@@ -252,6 +252,10 @@ public:
                      const PRUnichar* aReferrer=nsnull,
                      const char * aWindowTarget = nsnull);
 
+  NS_IMETHOD SessionHistoryInternalLoadURL(const PRUnichar *aURLSpec,
+   nsLoadFlags aType, nsISupports * aHistoryState, const PRUnichar* aReferrer);
+
+
   NS_IMETHOD GetCanGoBack(PRBool* aCanGoBack);
   NS_IMETHOD GetCanGoForward(PRBool* aCanGoForward);
   NS_IMETHOD GoBack();
@@ -1812,6 +1816,12 @@ NS_IMETHODIMP nsWebShell::Stop(void)
 
 //----------------------------------------
 
+NS_IMETHODIMP nsWebShell::SessionHistoryInternalLoadURL(const PRUnichar *aURLSpec,
+   nsLoadFlags aType, nsISupports * aHistoryState, const PRUnichar* aReferrer)
+{
+   return LoadURL(aURLSpec, nsnull, PR_FALSE, aType, 0, aHistoryState, aReferrer);
+}
+
 // History methods
 
 NS_IMETHODIMP

webshell/public/nsIWebShell.h

@@ -147,44 +147,10 @@ public:
    */
   NS_IMETHOD GetDocumentLoader(nsIDocumentLoader*& aResult) = 0;
 
-  /**
-   * Load the document associated with the specified URL into the WebShell.
-   */
-  NS_IMETHOD LoadURL(const PRUnichar *aURLSpec,
-                     nsIInputStream* aPostDataStream=nsnull,
-                     PRBool aModifyHistory=PR_TRUE,
-                     nsLoadFlags aType = nsIChannel::LOAD_NORMAL,
-                     const PRUint32 aLocalIP=0,
-                     nsISupports * aHistoryState=nsnull,
-                     const PRUnichar* aReferrer=nsnull) = 0;
-
-  /**
-   * Load the document associated with the specified URL into the WebShell.
-   */
-  NS_IMETHOD LoadURL(const PRUnichar *aURLSpec,
-                     const char* aCommand, 
-                     nsIInputStream* aPostDataStream=nsnull,
-                     PRBool aModifyHistory=PR_TRUE,
-                     nsLoadFlags aType = nsIChannel::LOAD_NORMAL,
-                     const PRUint32 aLocalIP=0,
-                     nsISupports * aHistoryState=nsnull,
-                     const PRUnichar* aReferrer=nsnull,
-                     const char * aWindowTarget = nsnull) = 0;
-
-  /**
-   * Load the document with the specified URI into the WebShell. Assuming you have
-   * an nsIURI instead of a PRUnichar string, this is the preferred way to load a url.
-   */
-   NS_IMETHOD LoadURI(nsIURI * aUri,
-                      const char * aCommand,
-                      nsIInputStream* aPostDataStream=nsnull,
-                      PRBool aModifyHistory=PR_TRUE,
-                      nsLoadFlags aType = nsIChannel::LOAD_NORMAL,
-                      const PRUint32 aLocalIP=0,
-                      nsISupports * aHistoryState=nsnull,
-                      const PRUnichar* aReferrer=nsnull,
-                      const char * aWindowTarget = nsnull) = 0;
-
+  NS_IMETHOD SessionHistoryInternalLoadURL(const PRUnichar *aURLSpec,
+                     nsLoadFlags aType,
+                     nsISupports * aHistoryState,
+                     const PRUnichar* aReferrer) = 0;
   //
   // History api's
   //

webshell/src/nsWebShell.cpp

@@ -252,6 +252,10 @@ public:
                      const PRUnichar* aReferrer=nsnull,
                      const char * aWindowTarget = nsnull);
 
+  NS_IMETHOD SessionHistoryInternalLoadURL(const PRUnichar *aURLSpec,
+   nsLoadFlags aType, nsISupports * aHistoryState, const PRUnichar* aReferrer);
+
+
   NS_IMETHOD GetCanGoBack(PRBool* aCanGoBack);
   NS_IMETHOD GetCanGoForward(PRBool* aCanGoForward);
   NS_IMETHOD GoBack();
@@ -1812,6 +1816,12 @@ NS_IMETHODIMP nsWebShell::Stop(void)
 
 //----------------------------------------
 
+NS_IMETHODIMP nsWebShell::SessionHistoryInternalLoadURL(const PRUnichar *aURLSpec,
+   nsLoadFlags aType, nsISupports * aHistoryState, const PRUnichar* aReferrer)
+{
+   return LoadURL(aURLSpec, nsnull, PR_FALSE, aType, 0, aHistoryState, aReferrer);
+}
+
 // History methods
 
 NS_IMETHODIMP