From fc60323e5e56feef4bc82c5a997fbe087081541b Mon Sep 17 00:00:00 2001 From: "darin%meer.net" Date: Thu, 1 Apr 2004 21:58:35 +0000 Subject: [PATCH] fixes bug 192022 "Web page progress bar in statusbar rarely works when browsing, stays blank" r=biesi sr=dbaron a=chofmann git-svn-id: svn://10.0.0.236/trunk@154436 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp b/mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp index e1de2a0a86b..9de5428df20 100644 --- a/mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp +++ b/mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp @@ -130,6 +130,11 @@ nsBrowserStatusFilter::OnStateChange(nsIWebProgress *aWebProgress, } if (aStateFlags & STATE_IS_REQUEST) { ++mTotalRequests; + + // 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. + mUseRealProgressFlag = (mTotalRequests == 1); } } else if (aStateFlags & STATE_STOP) { @@ -141,15 +146,6 @@ nsBrowserStatusFilter::OnStateChange(nsIWebProgress *aWebProgress, } } else if (aStateFlags & STATE_TRANSFERRING) { - if (aStateFlags & STATE_IS_DOCUMENT) { - nsCOMPtr chan(do_QueryInterface(aRequest)); - if (chan) { - nsCAutoString contentType; - chan->GetContentType(contentType); - if (!contentType.Equals(NS_LITERAL_CSTRING("text/html"))) - mUseRealProgressFlag = PR_TRUE; - } - } if (aStateFlags & STATE_IS_REQUEST) { if (!mUseRealProgressFlag && mTotalRequests) return OnProgressChange(nsnull, nsnull, 0, 0, mFinishedRequests, mTotalRequests);