From 32c0f2d6b7069f0d449651f2e841741ccdc30d96 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Thu, 15 Nov 2012 02:54:08 -0500 Subject: [PATCH] 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. --- dom/telephony/CallEvent.cpp | 7 +++++-- dom/telephony/TelephonyCall.cpp | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dom/telephony/CallEvent.cpp b/dom/telephony/CallEvent.cpp index 187bd5b8ef51..781ce882f65e 100644 --- a/dom/telephony/CallEvent.cpp +++ b/dom/telephony/CallEvent.cpp @@ -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, diff --git a/dom/telephony/TelephonyCall.cpp b/dom/telephony/TelephonyCall.cpp index 5223de0f5d67..eebbe5eab85c 100644 --- a/dom/telephony/TelephonyCall.cpp +++ b/dom/telephony/TelephonyCall.cpp @@ -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,