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 1099152 - Call gcSlice() or gc() depending on whether we want a incemental GC or not r=terrence

Browse Source
This commit is contained in:
Jon Coppeard 2015-01-02 17:19:43 +00:00
parent 069f4c9391
commit 6ced129b68
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jsgc.cpp
View File

@ -3324,7 +3324,7 @@ GCRuntime::maybePeriodicFullGC()
*/
#ifndef JS_MORE_DETERMINISTIC
int64_t now = PRMJ_Now();
if (nextFullGCTime && nextFullGCTime <= now) {
if (nextFullGCTime && nextFullGCTime <= now && !isIncrementalGCInProgress()) {
if (chunkAllocationSinceLastGC ||
numArenasFreeCommitted > decommitThreshold)
{
@ -6362,7 +6362,7 @@ GCRuntime::notifyDidPaint()
if (zealMode == ZealFrameGCValue) {
JS::PrepareForFullGC(rt);
gcSlice(GC_NORMAL, JS::gcreason::REFRESH_FRAME);
gc(GC_NORMAL, JS::gcreason::REFRESH_FRAME);
return;
}
#endif