wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 981033 - Clear mActivelyCollecting before restarting CC. r=smaug

Browse Source
This commit is contained in:
Andrew McCreight 2014-03-11 07:34:35 -07:00
parent 60b29c62b7
commit d1cecbd6d3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xpcom/base/nsCycleCollector.cpp
View File

@ -3198,7 +3198,6 @@ nsCycleCollector::Collect(ccType aCCType,
if (mActivelyCollecting || mFreeingSnowWhite) {
return false;
}
AutoRestore<bool> ar(mActivelyCollecting);
mActivelyCollecting = true;
bool startedIdle = (mIncrementalPhase == IdlePhase);
@ -3239,6 +3238,10 @@ nsCycleCollector::Collect(ccType aCCType,
}
} while (!aBudget.checkOverBudget() && !finished);
// Clear mActivelyCollecting here to ensure that a recursive call to
// Collect() does something.
mActivelyCollecting = false;
if (aCCType != SliceCC && !startedIdle) {
// We were in the middle of an incremental CC (using its own listener).
// Somebody has forced a CC, so after having finished out the current CC,