Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 395134 - When resuming a download, strange things happen in the UI. Patch by Edward Lee <edilee@gmail.com>. r=sdwilsh, a=mconnor

Browse Source
This commit is contained in:
sdwilsh@shawnwilsher.com 2007-09-17 13:40:47 -07:00
parent 3c215ff117
commit 93ab1748a9
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
toolkit/components/downloads/src/nsDownloadManager.cpp
View File

@ -1498,6 +1498,7 @@ nsDownload::nsDownload() : mDownloadState(nsIDownloadManager::DOWNLOAD_NOTSTARTE
mLastUpdate(PR_Now() - (PRUint32)gUpdateInterval),
mPaused(PR_FALSE),
mWasResumed(PR_FALSE),
mResumedAt(0),
mSpeed(0)
{
}
@ -1744,9 +1745,7 @@ nsDownload::OnProgressChange64(nsIWebProgress *aWebProgress,
// during that time for more accuracy.
double elapsedSecs = double(delta) / PR_USEC_PER_SEC;
if (elapsedSecs > 0) {
nsUint64 curTotalProgress = (PRUint64)aCurTotalProgress;
nsUint64 diffBytes = curTotalProgress - nsUint64(mCurrBytes);
double speed = double(diffBytes) / elapsedSecs;
double speed = double(aCurTotalProgress - mCurrBytes) / elapsedSecs;
if (mCurrBytes == 0) {
mSpeed = speed;
} else {
@ -1755,17 +1754,19 @@ nsDownload::OnProgressChange64(nsIWebProgress *aWebProgress,
}
}
if (aMaxTotalProgress > 0)
mPercentComplete = (PRInt32)((PRFloat64)aCurTotalProgress * 100 / aMaxTotalProgress + .5);
else
mPercentComplete = -1;
mCurrBytes = aCurTotalProgress;
mMaxBytes = aMaxTotalProgress;
PRUint64 currBytes, maxBytes;
(void)GetAmountTransferred(&currBytes);
(void)GetSize(&maxBytes);
if (aMaxTotalProgress > 0)
mPercentComplete = (PRInt32)((PRFloat64)currBytes * 100 / maxBytes + .5);
else
mPercentComplete = -1;
mDownloadManager->NotifyListenersOnProgressChange(
aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress,
aCurTotalProgress, aMaxTotalProgress, this);
aWebProgress, aRequest, currBytes, maxBytes, currBytes, maxBytes, this);
return NS_OK;
}
@ -1884,12 +1885,6 @@ nsDownload::OnStateChange(nsIWebProgress* aWebProgress,
if (mMaxBytes == LL_MAXUINT)
mMaxBytes = mCurrBytes;
// Files less than 1Kb shouldn't show up as 0Kb.
if (mMaxBytes < 1024) {
mCurrBytes = 1024;
mMaxBytes = 1024;
}
mPercentComplete = 100;
#ifdef XP_WIN
@ -1985,14 +1980,14 @@ nsDownload::GetPercentComplete(PRInt32* aPercentComplete)
NS_IMETHODIMP
nsDownload::GetAmountTransferred(PRUint64* aAmountTransferred)
{
*aAmountTransferred = mCurrBytes;
*aAmountTransferred = mCurrBytes + mResumedAt;
return NS_OK;
}
NS_IMETHODIMP
nsDownload::GetSize(PRUint64* aSize)
{
*aSize = mMaxBytes;
*aSize = mMaxBytes + (mMaxBytes != LL_MAXUINT ? mResumedAt : 0);
return NS_OK;
}
@ -2112,6 +2107,11 @@ nsDownload::PauseResume(PRBool aPause)
rv = resumableChannel->ResumeAt(fileSize, mEntityID);
NS_ENSURE_SUCCESS(rv, rv);
// Track where we resumed because progress notifications restart at 0
mResumedAt = fileSize;
mCurrBytes = 0;
mMaxBytes = LL_MAXUINT;
// Set the referrer
if (mReferrer) {
nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(channel));

8
toolkit/components/downloads/src/nsDownloadManager.h
View File

@ -243,12 +243,20 @@ private:
PRUint32 mID;
PRInt32 mPercentComplete;
/**
* These bytes are based on the position of where the request started, so 0
* doesn't necessarily mean we have nothing. Use GetAmountTransferred and
* GetSize for the real transferred amount and size.
*/
PRUint64 mCurrBytes;
PRUint64 mMaxBytes;
PRTime mStartTime;
PRTime mLastUpdate;
PRBool mPaused;
PRBool mWasResumed;
PRUint64 mResumedAt;
double mSpeed;
friend class nsDownloadManager;