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 678615, part 2: remove FinishCycleCollection. r=smaug

Browse Source
This commit is contained in:
Andrew McCreight 2012-04-25 08:10:09 -07:00
parent a5af270e47
commit a9c6928a04
4 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/xpconnect/src/nsXPConnect.cpp
View File

@ -578,12 +578,6 @@ nsXPConnect::FinishTraverse()
return NS_OK;
}
nsresult
nsXPConnect::FinishCycleCollection()
{
return NS_OK;
}
nsCycleCollectionParticipant *
nsXPConnect::ToParticipant(void *p)
{

1
js/xpconnect/src/xpcprivate.h
View File

@ -539,7 +539,6 @@ public:
virtual void NotifyEnterMainThread();
virtual nsresult BeginCycleCollection(nsCycleCollectionTraversalCallback &cb);
virtual nsresult FinishTraverse();
virtual nsresult FinishCycleCollection();
virtual nsCycleCollectionParticipant *ToParticipant(void *p);
virtual bool NeedCollect();
virtual void Collect(PRUint32 reason, PRUint32 kind);

15
xpcom/base/nsCycleCollector.cpp
View File

@ -1063,11 +1063,6 @@ struct nsCycleCollectionXPCOMRuntime :
return NS_OK;
}
nsresult FinishCycleCollection()
{
return NS_OK;
}
inline nsCycleCollectionParticipant *ToParticipant(void *p);
};
@ -3207,19 +3202,9 @@ nsCycleCollector::FinishCollection(nsICycleCollectorListener *aListener)
mStats.Dump();
#endif
for (PRUint32 i = 0; i <= nsIProgrammingLanguage::MAX; ++i) {
if (mRuntimes[i])
mRuntimes[i]->FinishCycleCollection();
}
timeLog.Checkpoint("mRuntimes[*]->FinishCycleCollection()");
mFollowupCollection = true;
#ifdef DEBUG_CC
// We wait until after FinishCollection to check the white nodes because
// some objects may outlive CollectWhite but then be freed by
// FinishCycleCollection (like XPConnect's deferred release of native
// objects).
PRUint32 i, count = mWhiteNodes->Length();
for (i = 0; i < count; ++i) {
PtrInfo *pinfo = mWhiteNodes->ElementAt(i);

1
xpcom/base/nsCycleCollector.h
View File

@ -52,7 +52,6 @@ struct nsCycleCollectionLanguageRuntime
{
virtual nsresult BeginCycleCollection(nsCycleCollectionTraversalCallback &cb) = 0;
virtual nsresult FinishTraverse() = 0;
virtual nsresult FinishCycleCollection() = 0;
virtual nsCycleCollectionParticipant *ToParticipant(void *p) = 0;
};