Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stash our bindings in an array before destroying them, in case someone decides

Browse Source 
to try to add a binding to the hashtable from a binding destructor.  Bug
283698, r+sr=bryner


git-svn-id: svn://10.0.0.236/trunk@169947 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu 2005-02-27 17:24:53 +00:00
parent 1ffe37271c
commit 77cb09d7fb
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/content/xbl/src/nsBindingManager.cpp
View File

@ -779,20 +779,36 @@ nsBindingManager::ProcessAttachedQueue()
}
PR_STATIC_CALLBACK(PLDHashOperator)
ExecuteDetachedHandler(nsISupports *aKey,
nsXBLBinding *aBinding, void* aClosure)
AccumulateBindingsToDetach(nsISupports *aKey, nsXBLBinding *aBinding,
void* aVoidArray)
{
aBinding->ExecuteDetachedHandler();
nsVoidArray* arr = NS_STATIC_CAST(nsVoidArray*, aVoidArray);
// Hold an owning reference to this binding, just in case
if (arr->AppendElement(aBinding))
NS_ADDREF(aBinding);
return PL_DHASH_NEXT;
}
PR_STATIC_CALLBACK(PRBool)
ExecuteDetachedHandler(void* aBinding, void* aClosure)
{
NS_PRECONDITION(aBinding, "Null binding in list?");
nsXBLBinding* binding = NS_STATIC_CAST(nsXBLBinding*, aBinding);
binding->ExecuteDetachedHandler();
// Drop our ref to the binding now
NS_RELEASE(binding);
return PR_TRUE;
}
NS_IMETHODIMP
nsBindingManager::ExecuteDetachedHandlers()
{
// Walk our hashtable of bindings.
if (mBindingTable.IsInitialized())
mBindingTable.EnumerateRead(ExecuteDetachedHandler, nsnull);
if (mBindingTable.IsInitialized()) {
nsVoidArray bindingsToDetach;
mBindingTable.EnumerateRead(AccumulateBindingsToDetach, &bindingsToDetach);
bindingsToDetach.EnumerateForwards(ExecuteDetachedHandler, nsnull);
}
return NS_OK;
}