Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 725885: Worker interval timers can be deleted prematurely. r=bent

Browse Source 
--HG--
extra : rebase_source : 9588ec51cd18a7bf2ac3c07aa6ef0dfe50a01bef
This commit is contained in:
Kyle Huey 2012-02-09 19:03:11 -08:00
parent fd7fd21135
commit aaa6210624
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/workers/WorkerPrivate.cpp
View File

@ -3700,7 +3700,11 @@ WorkerPrivate::RunExpiredTimeouts(JSContext* aCx)
NS_ASSERTION(!mTimeouts.Contains(info), "Shouldn't have duplicates!");
info->mTargetTime += info->mInterval;
// NB: We must ensure that info->mTargetTime > now (where now is the
// now above, not literally TimeStamp::Now()) or we will remove the
// interval in the next loop below.
info->mTargetTime = NS_MAX(info->mTargetTime + info->mInterval,
now + TimeDuration::FromMilliseconds(1));
mTimeouts.InsertElementSorted(info, comparator);
}
}
@ -3712,6 +3716,8 @@ WorkerPrivate::RunExpiredTimeouts(JSContext* aCx)
for (PRUint32 index = 0; index < mTimeouts.Length(); ) {
nsAutoPtr<TimeoutInfo>& info = mTimeouts[index];
if (info->mTargetTime <= now || info->mCanceled) {
NS_ASSERTION(!info->mIsInterval || info->mCanceled,
"Interval timers can only be removed when canceled!");
mTimeouts.RemoveElement(info);
}
else {