whack status feedback to be a nsIWebProgressListener and not a

DocumentLoaderObserver. Yeah!!! We need to be a progress event sink as well
to handle the cases where urls don't get run through a load group.
Temporarily disable timeout code for starting / stopping the meteors.
remove all old nsIDocumentLoaderObserver cruft

mailnews/base/src/nsMsgStatusFeedback.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "msgCore.h"
+#include "nsIWebProgress.h"
 #include "nsIDOMWindow.h"
 #include "nsPIDOMWindow.h"
 #include "nsMsgStatusFeedback.h"
@@ -29,7 +30,6 @@
 #include "nsIDocument.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMXULDocument.h"
-#include "nsIObserverService.h"
 #include "nsIDocShell.h"
 
 
@@ -49,112 +49,67 @@ nsMsgStatusFeedback::~nsMsgStatusFeedback()
 {
 }
 
-//
+NS_IMPL_THREADSAFE_ADDREF(nsMsgStatusFeedback);
-// nsISupports
+NS_IMPL_THREADSAFE_RELEASE(nsMsgStatusFeedback);
-//
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsMsgStatusFeedback,
-                              nsIMsgStatusFeedback,
-                              nsIDocumentLoaderObserver)
 
-// nsIDocumentLoaderObserver methods
+NS_INTERFACE_MAP_BEGIN(nsMsgStatusFeedback)
+   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIMsgStatusFeedback)
+   NS_INTERFACE_MAP_ENTRY(nsIMsgStatusFeedback)
+   NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener) 
+NS_INTERFACE_MAP_END
 
-NS_IMETHODIMP
+//////////////////////////////////////////////////////////////////////////////////
-nsMsgStatusFeedback::OnStartDocumentLoad(nsIDocumentLoader* aLoader, nsIURI* aURL, const char* aCommand)
+// nsMsgStatusFeedback::nsIWebProgressListener
+//////////////////////////////////////////////////////////////////////////////////
+
+NS_IMETHODIMP nsMsgStatusFeedback::OnProgressChange(nsIChannel* aChannel,
+   PRInt32 aCurSelfProgress, PRInt32 aMaxSelfProgress, 
+   PRInt32 aCurTotalProgress, PRInt32 aMaxTotalProgress)
 {
-	NS_PRECONDITION(aLoader != nsnull, "null ptr");
+  PRInt32 percentage = 0;
-	if (! aLoader)
+  if (aMaxTotalProgress > 0)
-	    return NS_ERROR_NULL_POINTER;
+  {
+    percentage =  (aCurTotalProgress * 100) / aMaxTotalProgress;
+    if (percentage)
+      ShowProgress(percentage);
+  }
 
-	NS_PRECONDITION(aURL != nsnull, "null ptr");
+   return NS_OK;
-	if (! aURL)
-	    return NS_ERROR_NULL_POINTER;
-
-	nsresult rv = NS_OK;
-
-	if (mWindow)
-	{
-		nsIDOMWindow *aWindow = mWindow;
-		nsCOMPtr<nsIScriptGlobalObject>
-	  globalScript(do_QueryInterface(aWindow));
-    nsCOMPtr<nsIDocShell> docShell;
-		
-    if (globalScript)
-			globalScript->GetDocShell(getter_AddRefs(docShell));
-		
-    nsCOMPtr<nsIWebShell> webshell(do_QueryInterface(docShell));
-    nsCOMPtr<nsIWebShell> rootWebshell;
-		if (webshell)
-			webshell->GetRootWebShell(*getter_AddRefs(rootWebshell));
-		
-    if (rootWebshell) 
-		{
-		  // Kick start the throbber
-      StartMeteors();
-      ShowStatusString(NS_ConvertASCIItoUCS2("Loading Document...").GetUnicode());
-		  // Enable the Stop buton
-		  // setAttribute( rootWebshell, "canStop", "disabled", "" );
-		}
-	}
-	return rv;
 }
       
-
+NS_IMETHODIMP nsMsgStatusFeedback::OnChildProgressChange(nsIChannel* aChannel,
-NS_IMETHODIMP
+   PRInt32 aCurSelfProgress, PRInt32 aMaxSelfProgress)
-nsMsgStatusFeedback::OnEndDocumentLoad(nsIDocumentLoader* aLoader, nsIChannel* channel, nsresult aStatus)
 {
-  NS_PRECONDITION(aLoader != nsnull, "null ptr");
+   return NS_OK;
-  if (! aLoader)
-    return NS_ERROR_NULL_POINTER;
-
-  NS_PRECONDITION(channel != nsnull, "null ptr");
-  if (! channel)
-    return NS_ERROR_NULL_POINTER;
-
-  nsresult rv = NS_OK;
-
-	if (mWindow)
-	{
-		nsIDOMWindow *aWindow = mWindow;
-		nsCOMPtr<nsIScriptGlobalObject>
-		globalScript(do_QueryInterface(aWindow));
-    nsCOMPtr<nsIDocShell> docShell;
-		if (globalScript)
-			globalScript->GetDocShell(getter_AddRefs(docShell));
-		
-    nsCOMPtr<nsIWebShell> webshell(do_QueryInterface(docShell));
-    nsCOMPtr<nsIWebShell> rootWebshell;
-		if (webshell)
-			webshell->GetRootWebShell(*getter_AddRefs(rootWebshell));
-		if (rootWebshell) 
-		{
-		  // stop the throbber
-      StopMeteors();
-      ShowStatusString(NS_ConvertASCIItoUCS2("Document: Done").GetUnicode());
-		  // Disable the Stop buton
-		  //setAttribute( rootWebshell, "canStop", "disabled", "true" );
-		}
-	}
-  return rv;
 }
 
-NS_IMETHODIMP nsMsgStatusFeedback::OnStartURLLoad(nsIDocumentLoader* loader, nsIChannel* channel)
+NS_IMETHODIMP nsMsgStatusFeedback::OnStatusChange(nsIChannel* aChannel,
+   PRInt32 aProgressStatusFlags)
 {
-	return NS_OK;
+  if (aProgressStatusFlags & nsIWebProgress::flag_net_start)
+  {
+    m_lastPercent = 0;
+    StartMeteors();
+    ShowStatusString(NS_ConvertASCIItoUCS2("Loading Document...").GetUnicode());
+  }
+  if (aProgressStatusFlags & nsIWebProgress::flag_net_stop)
+  {
+    StopMeteors();
+    ShowStatusString(NS_ConvertASCIItoUCS2("Document: Done").GetUnicode());
+  }
+
+  return NS_OK;
 }
 
-NS_IMETHODIMP nsMsgStatusFeedback::OnProgressURLLoad(nsIDocumentLoader* loader, nsIChannel* channel, PRUint32 aProgress, PRUint32 aProgressMax)
+NS_IMETHODIMP nsMsgStatusFeedback::OnChildStatusChange(nsIChannel* aChannel,
+   PRInt32 aProgressStatusFlags)
 {
-	return NS_OK;
+   return NS_OK;
 }
 
-NS_IMETHODIMP nsMsgStatusFeedback::OnStatusURLLoad(nsIDocumentLoader* loader, nsIChannel* channel, nsString& aMsg)
+NS_IMETHODIMP nsMsgStatusFeedback::OnLocationChange(nsIURI* aLocation)
 {
-	return NS_OK;
+   return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgStatusFeedback::OnEndURLLoad(nsIDocumentLoader* loader, nsIChannel* channel, nsresult aStatus)
-{
-	return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -171,9 +126,12 @@ nsMsgStatusFeedback::ShowProgress(PRInt32 percentage)
 {
 	nsAutoString strPercentage;
 
-	if (percentage == m_lastPercent)
+  // if the percentage hasn't changed...OR if we are going from 0 to 100% in one step
+  // then don't bother....just fall out....
+	if (percentage == m_lastPercent || (m_lastPercent == 0 && percentage >= 100))
 		return NS_OK;
-	m_lastPercent = percentage;
+  
+  m_lastPercent = percentage;
 
 	PRInt64 nowMS;
 	LL_I2L(nowMS, 0);
@@ -194,6 +152,8 @@ nsMsgStatusFeedback::ShowProgress(PRInt32 percentage)
   
   if (mStatusFeedback)
     mStatusFeedback->ShowProgress(percentage);
+  if (mQueuedMeteorStarts <= 0)
+    mQueuedMeteorStarts++;
 	return NS_OK;
 }
 
@@ -222,14 +182,16 @@ nsMsgStatusFeedback::StartMeteors()
   //only run the start timer if the meteors aren't spinning.
   if(!m_meteorsSpinning)
   {
+    NotifyStartMeteors(nsnull);
+#if 0
 	  rv = NS_NewTimer(getter_AddRefs(mStartTimer));
 	  if (NS_FAILED(rv)) return rv;
 
 	  rv = mStartTimer->Init(notifyStartMeteors, (void *)this,
 							 MSGFEEDBACK_TIMER_INTERVAL);
 	  if (NS_FAILED(rv)) return rv;
-
+	  m_meteorsSpinning = PR_TRUE;
-	  mQueuedMeteorStarts++;
+#endif
   }
   return NS_OK;
 }
@@ -261,13 +223,15 @@ nsMsgStatusFeedback::StopMeteors()
   //only run the stop timer if the meteors are actually spinning.
   if(m_meteorsSpinning)
   {
+    NotifyStopMeteors(nsnull);
+#if 0
 	  rv = NS_NewTimer(getter_AddRefs(mStopTimer));
 	  if (NS_FAILED(rv)) return rv;
 
 	  rv = mStopTimer->Init(notifyStopMeteors, (void *)this,
 							MSGFEEDBACK_TIMER_INTERVAL);
 	  if (NS_FAILED(rv)) return rv;
-
+#endif
 	  mQueuedMeteorStops++;
   }
   return NS_OK;
@@ -355,3 +319,15 @@ nsMsgStatusFeedback::NotifyStopMeteors(nsITimer* aTimer)
     mStatusFeedback->StopMeteors();
   m_meteorsSpinning = PR_FALSE;
 }
+
+NS_IMETHODIMP nsMsgStatusFeedback::OnProgress(nsIChannel* channel, nsISupports* ctxt, 
+                                          PRUint32 aProgress, PRUint32 aProgressMax)
+{
+  return OnProgressChange(channel, aProgress, aProgressMax, 
+                          aProgress /* current total progress */, aProgressMax /* max total progress */);
+}
+
+NS_IMETHODIMP nsMsgStatusFeedback::OnStatus(nsIChannel* channel, nsISupports* ctxt, const PRUnichar* aMsg)
+{
+  return ShowStatusString(aMsg);
+}

mailnews/base/src/nsMsgStatusFeedback.h

@@ -23,7 +23,7 @@
 #ifndef _nsMsgStatusFeedback_h
 #define _nsMsgStatusFeedback_h
 
-#include "nsIDocumentLoaderObserver.h"
+#include "nsIWebProgressListener.h"
 #include "nsIDOMWindow.h"
 #include "nsIWebShell.h"
 #include "nsIWebShellWindow.h"
@@ -31,9 +31,11 @@
 #include "nsITimer.h"
 #include "nsCOMPtr.h"
 #include "nsIMsgStatusFeedback.h"
+#include "nsIProgressEventSink.h"
 
 class nsMsgStatusFeedback : public nsIMsgStatusFeedback,
-                            public nsIDocumentLoaderObserver
+                            public nsIProgressEventSink,
+                            public nsIWebProgressListener
 {
 public:
 	nsMsgStatusFeedback();
@@ -41,9 +43,8 @@ public:
 
 	NS_DECL_ISUPPORTS
   NS_DECL_NSIMSGSTATUSFEEDBACK
-    
+  NS_DECL_NSIWEBPROGRESSLISTENER
-	// nsIDocumntLoaderObserver
+  NS_DECL_NSIPROGRESSEVENTSINK
-  NS_DECL_NSIDOCUMENTLOADEROBSERVER
 
 protected:
 	nsIDOMWindow			*mWindow;