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 889053 - Remove nsCycleCollectorParams::mDoNothing which does nothing. r=khuey

Browse Source
This commit is contained in:
Andrew McCreight 2013-07-18 09:07:28 -07:00
parent 812337fd99
commit e7edd1b360
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xpcom/base/nsCycleCollector.cpp
View File

@ -201,13 +201,11 @@ struct nsCycleCollectorParams
bool mLogAll;
bool mLogShutdown;
bool mAllTracesAtShutdown;
bool mDoNothing;
nsCycleCollectorParams() :
mLogAll (PR_GetEnv("XPCOM_CC_LOG_ALL") != NULL),
mLogShutdown (PR_GetEnv("XPCOM_CC_LOG_SHUTDOWN") != NULL),
mAllTracesAtShutdown (PR_GetEnv("XPCOM_CC_ALL_TRACES_AT_SHUTDOWN") != NULL),
mDoNothing (false)
mAllTracesAtShutdown (PR_GetEnv("XPCOM_CC_ALL_TRACES_AT_SHUTDOWN") != NULL)
{
}
};
@ -2668,9 +2666,6 @@ nsCycleCollector::ShutdownThreads()
void
nsCycleCollector::RegisterJSRuntime(CycleCollectedJSRuntime *aJSRuntime)
{
if (mParams.mDoNothing)
return;
if (mJSRuntime)
Fault("multiple registrations of cycle collector JS runtime", aJSRuntime);
@ -2689,9 +2684,6 @@ nsCycleCollector::RegisterJSRuntime(CycleCollectedJSRuntime *aJSRuntime)
void
nsCycleCollector::ForgetJSRuntime()
{
if (mParams.mDoNothing)
return;
if (!mJSRuntime)
Fault("forgetting non-registered cycle collector JS runtime");
@ -2731,9 +2723,6 @@ nsCycleCollector::Suspect(void *n, nsCycleCollectionParticipant *cp,
MOZ_ASSERT(nsCycleCollector_isScanSafe(n, cp),
"suspected a non-scansafe pointer");
if (mParams.mDoNothing)
return;
mPurpleBuf.Put(n, cp, aRefCnt);
}
@ -2757,9 +2746,6 @@ nsCycleCollector::FixGrayBits(bool aForceGC)
MOZ_ASSERT(NS_IsMainThread(),
"nsCycleCollector::FixGrayBits() must be called on the main thread.");
if (mParams.mDoNothing)
return;
if (!mJSRuntime)
return;
@ -2925,9 +2911,6 @@ nsCycleCollector::BeginCollection(ccType aCCType,
// aListener should be Begin()'d before this
TimeLog timeLog;
if (mParams.mDoNothing)
return false;
bool mergeZones = ShouldMergeZones(aCCType);
if (mResults) {
mResults->mMergedZones = mergeZones;
@ -2996,8 +2979,6 @@ nsCycleCollector::FinishCollection(nsICycleCollectorListener *aListener)
ClearGraph();
timeLog.Checkpoint("ClearGraph()");
mParams.mDoNothing = false;
return collected;
}
@ -3026,8 +3007,6 @@ nsCycleCollector::Shutdown()
}
ShutdownCollect(listener);
}
mParams.mDoNothing = true;
}
void