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 913666, part 4 - Sink free floating code from nsCycleCollector::Collect into BeginCollection. r=smaug

Browse Source 
The hg diff for this commit is terrible, but all it is doing is taking the code
in nsCycleCollector::Collect from after PrepareForCollection through BeginCollection
and moving it into BeginCollection.
This commit is contained in:
Andrew McCreight 2013-09-10 16:33:41 -07:00
parent a1c11fcfd7
commit 567cf603ca
1 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
xpcom/base/nsCycleCollector.cpp
View File

@ -2704,38 +2704,7 @@ nsCycleCollector::Collect(ccType aCCType,
}
PrepareForCollection(aResults, aWhiteNodes);
bool isShutdown = (aCCType == ShutdownCC);
// Set up the listener for this CC.
MOZ_ASSERT_IF(isShutdown, !aListener);
nsCOMPtr<nsICycleCollectorListener> listener(aListener);
aListener = nullptr;
if (!listener) {
if (mParams.mLogAll || (isShutdown && mParams.mLogShutdown)) {
nsRefPtr<nsCycleCollectorLogger> logger = new nsCycleCollectorLogger();
if (isShutdown && mParams.mAllTracesAtShutdown) {
logger->SetAllTraces();
}
listener = logger.forget();
}
}
bool forceGC = isShutdown;
if (!forceGC && listener) {
// On a WantAllTraces CC, force a synchronous global GC to prevent
// hijinks from ForgetSkippable and compartmental GCs.
listener->GetWantAllTraces(&forceGC);
}
FixGrayBits(forceGC);
FreeSnowWhite(true);
if (listener && NS_FAILED(listener->Begin())) {
listener = nullptr;
}
BeginCollection(aCCType, listener);
BeginCollection(aCCType, aListener);
bool collectedAny = CollectWhite();
CleanupAfterCollection();
return collectedAny;
@ -2780,15 +2749,44 @@ void
nsCycleCollector::BeginCollection(ccType aCCType,
nsICycleCollectorListener *aListener)
{
// aListener should be Begin()'d before this
TimeLog timeLog;
bool isShutdown = (aCCType == ShutdownCC);
// Set up the listener for this CC.
MOZ_ASSERT_IF(isShutdown, !aListener);
nsCOMPtr<nsICycleCollectorListener> listener(aListener);
aListener = nullptr;
if (!listener) {
if (mParams.mLogAll || (isShutdown && mParams.mLogShutdown)) {
nsRefPtr<nsCycleCollectorLogger> logger = new nsCycleCollectorLogger();
if (isShutdown && mParams.mAllTracesAtShutdown) {
logger->SetAllTraces();
}
listener = logger.forget();
}
}
bool forceGC = isShutdown;
if (!forceGC && listener) {
// On a WantAllTraces CC, force a synchronous global GC to prevent
// hijinks from ForgetSkippable and compartmental GCs.
listener->GetWantAllTraces(&forceGC);
}
FixGrayBits(forceGC);
FreeSnowWhite(true);
if (listener && NS_FAILED(listener->Begin())) {
listener = nullptr;
}
// Set up the data structures for building the graph.
bool mergeZones = ShouldMergeZones(aCCType);
if (mResults) {
mResults->mMergedZones = mergeZones;
}
GCGraphBuilder builder(this, mGraph, mJSRuntime, aListener,
GCGraphBuilder builder(this, mGraph, mJSRuntime, listener,
mergeZones);
if (mJSRuntime) {
@ -2804,7 +2802,7 @@ nsCycleCollector::BeginCollection(ccType aCCType,
MarkRoots(builder);
timeLog.Checkpoint("MarkRoots()");
ScanRoots(aListener);
ScanRoots(listener);
timeLog.Checkpoint("ScanRoots()");
mScanInProgress = false;