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 806279 - fix bustage due to unusual CC macro usage in Telephony code, see bug 811926 - no review, bustage

Browse Source 
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:
Benoit Jacob 2012-11-15 02:54:08 -05:00
parent 58175ef06b
commit bbe33540d5
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/telephony/CallEvent.cpp
View File

@ -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,

6
dom/telephony/TelephonyCall.cpp
View File

@ -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,