mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-13 18:27:35 +00:00
improved fix for bug 15696 (leaking an atom). r=floppy moose
This commit is contained in:
parent
54f5ef35c3
commit
ab64f11257
@ -160,9 +160,9 @@ NS_IMETHODIMP PlaceholderTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransact
|
||||
editTxn->QueryInterface(nsIAbsorbingTransaction::GetIID(), getter_AddRefs(plcTxn));
|
||||
if (plcTxn)
|
||||
{
|
||||
nsIAtom *atom;
|
||||
plcTxn->GetTxnName(&atom);
|
||||
if (atom && (atom == mName.get()))
|
||||
nsCOMPtr<nsIAtom> atom;
|
||||
plcTxn->GetTxnName(getter_AddRefs(atom));
|
||||
if (atom && (atom == mName))
|
||||
{
|
||||
nsCOMPtr<nsIDOMNode> otherTxnStartNode;
|
||||
PRInt32 otherTxnStartOffset;
|
||||
@ -177,7 +177,6 @@ NS_IMETHODIMP PlaceholderTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransact
|
||||
*aDidMerge = PR_TRUE;
|
||||
}
|
||||
}
|
||||
NS_IF_RELEASE(atom);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -160,9 +160,9 @@ NS_IMETHODIMP PlaceholderTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransact
|
||||
editTxn->QueryInterface(nsIAbsorbingTransaction::GetIID(), getter_AddRefs(plcTxn));
|
||||
if (plcTxn)
|
||||
{
|
||||
nsIAtom *atom;
|
||||
plcTxn->GetTxnName(&atom);
|
||||
if (atom && (atom == mName.get()))
|
||||
nsCOMPtr<nsIAtom> atom;
|
||||
plcTxn->GetTxnName(getter_AddRefs(atom));
|
||||
if (atom && (atom == mName))
|
||||
{
|
||||
nsCOMPtr<nsIDOMNode> otherTxnStartNode;
|
||||
PRInt32 otherTxnStartOffset;
|
||||
@ -177,7 +177,6 @@ NS_IMETHODIMP PlaceholderTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransact
|
||||
*aDidMerge = PR_TRUE;
|
||||
}
|
||||
}
|
||||
NS_IF_RELEASE(atom);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user