Better explain nsIWebNavigation "document" attribute, fix spelling of "referringURI" attribute. b=192322 r=danm@netscape.com sr=bzbarsky@mit.edu a=asa@mozilla.org

docshell/base/nsDocShell.cpp

@@ -2396,7 +2396,7 @@ NS_IMETHODIMP nsDocShell::GotoIndex(PRInt32 aIndex)
 NS_IMETHODIMP
 nsDocShell::LoadURI(const PRUnichar * aURI,
                     PRUint32 aLoadFlags,
-                    nsIURI * aReferingURI,
+                    nsIURI * aReferringURI,
                     nsIInputStream * aPostStream,
                     nsIInputStream * aHeaderStream)
 {
@@ -2441,7 +2441,7 @@ nsDocShell::LoadURI(const PRUnichar * aURI,
     PRUint32 loadType = MAKE_LOAD_TYPE(LOAD_NORMAL, aLoadFlags); 
     loadInfo->SetLoadType(ConvertLoadTypeToDocShellLoadInfo(loadType));
     loadInfo->SetPostDataStream(aPostStream);
-    loadInfo->SetReferrer(aReferingURI);
+    loadInfo->SetReferrer(aReferringURI);
     loadInfo->SetHeadersStream(aHeaderStream);
 
     rv = LoadURI(uri, loadInfo, 0, PR_TRUE);
@@ -2787,7 +2787,7 @@ nsDocShell::GetCurrentURI(nsIURI ** aURI)
 }
 
 NS_IMETHODIMP
-nsDocShell::GetReferingURI(nsIURI ** aURI)
+nsDocShell::GetReferringURI(nsIURI ** aURI)
 {
     NS_ENSURE_ARG_POINTER(aURI);
 

docshell/base/nsIWebNavigation.idl

@@ -182,7 +182,9 @@ interface nsIWebNavigation : nsISupports
   void stop(in unsigned long stopFlags);
 
  /**
-  * Retrieves the current DOM document for the WebBrowser.
+  * Retrieves the current DOM document for the frame, or lazily creates a
+  * blank document if there is none. This attribute never returns null except
+  * for unexpected error situations.
   */
   readonly attribute nsIDOMDocument document;
 
@@ -192,9 +194,9 @@ interface nsIWebNavigation : nsISupports
   readonly attribute nsIURI currentURI;
 
  /**
-  * The refering URI.
+  * The referring URI.
   */
-  readonly attribute nsIURI referingURI;
+  readonly attribute nsIURI referringURI;
 
  /**
   * The session history object used to store the session history for the

embedding/browser/webBrowser/nsWebBrowser.cpp

@@ -604,7 +604,7 @@ NS_IMETHODIMP nsWebBrowser::GoForward()
 
 NS_IMETHODIMP nsWebBrowser::LoadURI(const PRUnichar* aURI,
                                     PRUint32 aLoadFlags,
-                                    nsIURI* aReferingURI,
+                                    nsIURI* aReferringURI,
                                     nsIInputStream* aPostDataStream,
                                     nsIInputStream* aExtraHeaderStream)
 {
@@ -612,7 +612,7 @@ NS_IMETHODIMP nsWebBrowser::LoadURI(const PRUnichar* aURI,
 
    return mDocShellAsNav->LoadURI(aURI,
                                   aLoadFlags,
-                                  aReferingURI,
+                                  aReferringURI,
                                   aPostDataStream,
                                   aExtraHeaderStream);
 }
@@ -645,11 +645,11 @@ NS_IMETHODIMP nsWebBrowser::GetCurrentURI(nsIURI** aURI)
    return mDocShellAsNav->GetCurrentURI(aURI);
 }
 
-NS_IMETHODIMP nsWebBrowser::GetReferingURI(nsIURI** aURI)
+NS_IMETHODIMP nsWebBrowser::GetReferringURI(nsIURI** aURI)
 {
     NS_ENSURE_STATE(mDocShell);
 
-    return mDocShellAsNav->GetReferingURI(aURI);
+    return mDocShellAsNav->GetReferringURI(aURI);
 }
 
 NS_IMETHODIMP nsWebBrowser::SetSessionHistory(nsISHistory* aSessionHistory)

embedding/qa/jstests/webNav/nsIWebNavTestLib.js

@@ -245,7 +245,7 @@ function testReferingURI(webNav)
     return false;
   } 
     // Get the refering URI
-  getRefURI = webNav.referingURI;
+  getRefURI = webNav.referringURI;
  // alert("The refering uri = " + getRefURI.spec);
 
   return getRefURI;     

embedding/qa/testembed/nsIWebNav.cpp

@@ -455,7 +455,7 @@ void CNsIWebNav::GetReferingURITest(PRInt16 displayMode)
 		 QAOutput("We GOT the URI.", 1);
 	  else
 		 QAOutput("We DIDN'T GET the URI.", 1);
-	  rv = qaWebNav->GetReferingURI(getter_AddRefs(theURI));
+	  rv = qaWebNav->GetReferringURI(getter_AddRefs(theURI));
 	  RvTestResult(rv, "GetReferingURI() test", displayMode);
 //	  rv = qaWebNav->LoadURI(NS_ConvertASCIItoUCS2(myDialog.m_urlfield).get(),
 //								myDialog.m_flagvalue, theURI, nsnull, nsnull);

xpfe/components/shistory/src/nsSHistory.cpp

@@ -597,7 +597,7 @@ nsSHistory::GetCurrentURI(nsIURI** aResultURI)
 
 
 NS_IMETHODIMP
-nsSHistory::GetReferingURI(nsIURI** aURI)
+nsSHistory::GetReferringURI(nsIURI** aURI)
 {
     *aURI = nsnull;
     // Not implemented
@@ -624,7 +624,7 @@ nsSHistory::GetSessionHistory(nsISHistory** aSessionHistory)
 NS_IMETHODIMP
 nsSHistory::LoadURI(const PRUnichar* aURI,
                     PRUint32 aLoadFlags,
-                    nsIURI* aReferingURI,
+                    nsIURI* aReferringURI,
                     nsIInputStream* aPostStream,
                     nsIInputStream* aExtraHeaderStream)
 {