From 5eb09457145cdddc2e5e7523f690e1144d9fb76f Mon Sep 17 00:00:00 2001
From: "cbiesinger%web.de"
 <cbiesinger%web.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 1 Jun 2005 19:37:10 +0000
Subject: [PATCH] 209330 r=jag sr=darin a=shaver make sure to always check
 whether an OnStateChange call is needed, instead of returning early while
 calling OnProgressChange

git-svn-id: svn://10.0.0.236/trunk@173969 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../xpfe/browser/src/nsBrowserStatusFilter.cpp   | 16 ++++++----------
 mozilla/xpfe/browser/src/nsBrowserStatusFilter.h |  3 ---
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp b/mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp
index bd976be3493..e54fbf6250c 100644
--- a/mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp
+++ b/mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp
@@ -127,7 +127,6 @@ nsBrowserStatusFilter::OnStateChange(nsIWebProgress *aWebProgress,
             mTotalRequests = 0;
             mFinishedRequests = 0;
             mUseRealProgressFlag = PR_FALSE;
-            mIsLoadingDocument = PR_TRUE;
         }
         if (aStateFlags & STATE_IS_REQUEST) {
             ++mTotalRequests;
@@ -135,21 +134,18 @@ nsBrowserStatusFilter::OnStateChange(nsIWebProgress *aWebProgress,
             // if the total requests exceeds 1, then we'll base our progress
             // notifications on the percentage of completed requests.
             // otherwise, progress for the single request will be reported.
-            // But if we're not loading a document, we must be sure to deliver
-            // OnStateChange for STATE_STOP correctly: use the real progress in
-            // such cases
-            mUseRealProgressFlag = (mTotalRequests == 1) || !mIsLoadingDocument;
+            mUseRealProgressFlag = (mTotalRequests == 1);
         }
     }
     else if (aStateFlags & STATE_STOP) {
-        if (aStateFlags & STATE_IS_NETWORK) {
-            mIsLoadingDocument = PR_FALSE;
-        }
         if (aStateFlags & STATE_IS_REQUEST) {
             ++mFinishedRequests;
+            // Note: Do not return from here. This is necessary so that the
+            // STATE_STOP can still be relayed to the listener if needed
+            // (bug 209330)
             if (!mUseRealProgressFlag && mTotalRequests)
-                return OnProgressChange(nsnull, nsnull, 0, 0,
-                                        mFinishedRequests, mTotalRequests);
+                OnProgressChange(nsnull, nsnull, 0, 0,
+                                 mFinishedRequests, mTotalRequests);
         }
     }
     else if (aStateFlags & STATE_TRANSFERRING) {
diff --git a/mozilla/xpfe/browser/src/nsBrowserStatusFilter.h b/mozilla/xpfe/browser/src/nsBrowserStatusFilter.h
index 5f79348ae4d..b86987285db 100644
--- a/mozilla/xpfe/browser/src/nsBrowserStatusFilter.h
+++ b/mozilla/xpfe/browser/src/nsBrowserStatusFilter.h
@@ -87,9 +87,6 @@ private:
     // indicates whether a timeout is pending
     PRPackedBool                     mDelayedStatus;
     PRPackedBool                     mDelayedProgress;
-
-    // indicates whether a document is currently loading
-    PRPackedBool                     mIsLoadingDocument;
 };
 
 #define NS_BROWSERSTATUSFILTER_CLASSNAME \