mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Bug 806279 - fix bustage due to unusual CC macro usage in Telephony code, see bug 811926 - no review, bustage
This fix consists in taking the old definition of the TRAVERSE_NATIVE_PTR macro and expanding it inline, as the new macros can't handle that unusual case (see bug 811926). Because it is expaning inline the old macro, it shouldn't make any difference.
This commit is contained in:
parent
f5eae0f15f
commit
32c0f2d6b7
@ -30,8 +30,11 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(CallEvent)
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(CallEvent,
|
||||
nsDOMEvent)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(tmp->mCall->ToISupports(),
|
||||
TelephonyCall, "mCall")
|
||||
// NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NATIVE_PTR(tmp->mCall->ToISupports(),
|
||||
// TelephonyCall, "mCall")
|
||||
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mCall");
|
||||
cb.NoteNativeChild(tmp->mCall->ToISupports(), NS_CYCLE_COLLECTION_PARTICIPANT(TelephonyCall));
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(CallEvent,
|
||||
|
@ -144,8 +144,10 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(TelephonyCall)
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(TelephonyCall,
|
||||
nsDOMEventTargetHelper)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(tmp->mTelephony->ToISupports(),
|
||||
Telephony, "mTelephony")
|
||||
// NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NATIVE_PTR(tmp->mTelephony->ToISupports(),
|
||||
// Telephony, "mTelephony")
|
||||
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mTelephony");
|
||||
cb.NoteNativeChild(tmp->mTelephony->ToISupports(), NS_CYCLE_COLLECTION_PARTICIPANT(Telephony));
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(TelephonyCall,
|
||||
|
Loading…
Reference in New Issue
Block a user