Revised LoadURL to take an nsIStreamListener; removed old document load hooks

content/base/public/nsIDocument.h

@@ -28,6 +28,7 @@ class nsIDocumentObserver;
 class nsIPresContext;
 class nsIPresShell;
 class nsISelection;
+class nsIStreamListener;
 class nsIStyleSet;
 class nsIStyleSheet;
 class nsIURL;
@@ -56,13 +57,9 @@ public:
   // returns the arena associated with this document.
   virtual nsIArena* GetArena() = 0;
 
-  virtual void LoadURL(nsIURL* aURL, nsIPostData* aPostData = 0) = 0;
-
-  virtual void StartDocumentLoad() = 0;
-  virtual void PauseDocumentLoad() = 0;
-  virtual void StopDocumentLoad() = 0;
-  virtual void WaitForDocumentLoad() = 0;
-  virtual PRBool IsDocumentLoaded() = 0;
+  NS_IMETHOD LoadURL(nsIURL* aURL,
+                     nsIStreamListener* aListener,
+                     nsIPostData* aPostData = 0) = 0;
 
   /**
    * Return the title of the document. May return null.

content/base/src/nsDocument.cpp

@@ -158,27 +158,6 @@ nsIArena* nsDocument::GetArena()
   return mArena;
 }
 
-void nsDocument::StartDocumentLoad()
-{
-}
-
-void nsDocument::PauseDocumentLoad()
-{
-}
-
-void nsDocument::StopDocumentLoad()
-{
-}
-
-void nsDocument::WaitForDocumentLoad()
-{
-}
-
-PRBool nsDocument::IsDocumentLoaded()
-{
-  return PR_TRUE;
-}
-
 const nsString* nsDocument::GetDocumentTitle() const
 {
   return mDocumentTitle;

content/base/src/nsDocument.h

@@ -43,12 +43,6 @@ public:
 
   virtual nsIArena* GetArena();
 
-  virtual void StartDocumentLoad();
-  virtual void PauseDocumentLoad();
-  virtual void StopDocumentLoad();
-  virtual void WaitForDocumentLoad();
-  virtual PRBool IsDocumentLoaded();
-
   /**
    * Return the title of the document. May return null.
    */

layout/base/public/nsIDocument.h

@@ -28,6 +28,7 @@ class nsIDocumentObserver;
 class nsIPresContext;
 class nsIPresShell;
 class nsISelection;
+class nsIStreamListener;
 class nsIStyleSet;
 class nsIStyleSheet;
 class nsIURL;
@@ -56,13 +57,9 @@ public:
   // returns the arena associated with this document.
   virtual nsIArena* GetArena() = 0;
 
-  virtual void LoadURL(nsIURL* aURL, nsIPostData* aPostData = 0) = 0;
-
-  virtual void StartDocumentLoad() = 0;
-  virtual void PauseDocumentLoad() = 0;
-  virtual void StopDocumentLoad() = 0;
-  virtual void WaitForDocumentLoad() = 0;
-  virtual PRBool IsDocumentLoaded() = 0;
+  NS_IMETHOD LoadURL(nsIURL* aURL,
+                     nsIStreamListener* aListener,
+                     nsIPostData* aPostData = 0) = 0;
 
   /**
    * Return the title of the document. May return null.

layout/base/src/nsDocument.cpp

@@ -158,27 +158,6 @@ nsIArena* nsDocument::GetArena()
   return mArena;
 }
 
-void nsDocument::StartDocumentLoad()
-{
-}
-
-void nsDocument::PauseDocumentLoad()
-{
-}
-
-void nsDocument::StopDocumentLoad()
-{
-}
-
-void nsDocument::WaitForDocumentLoad()
-{
-}
-
-PRBool nsDocument::IsDocumentLoaded()
-{
-  return PR_TRUE;
-}
-
 const nsString* nsDocument::GetDocumentTitle() const
 {
   return mDocumentTitle;

layout/base/src/nsDocument.h

@@ -43,12 +43,6 @@ public:
 
   virtual nsIArena* GetArena();
 
-  virtual void StartDocumentLoad();
-  virtual void PauseDocumentLoad();
-  virtual void StopDocumentLoad();
-  virtual void WaitForDocumentLoad();
-  virtual PRBool IsDocumentLoaded();
-
   /**
    * Return the title of the document. May return null.
    */