diff --git a/mozilla/content/events/src/nsEventListenerManager.cpp b/mozilla/content/events/src/nsEventListenerManager.cpp index 5a341e2b8a7..c9d94a0e8f2 100644 --- a/mozilla/content/events/src/nsEventListenerManager.cpp +++ b/mozilla/content/events/src/nsEventListenerManager.cpp @@ -103,16 +103,15 @@ nsIDOMEventGroup* gDOM2EventGroup; PRUint32 nsEventListenerManager::mInstanceCount = 0; -nsEventListenerManager::nsEventListenerManager() +nsEventListenerManager::nsEventListenerManager() : + mManagerType(NS_ELM_NONE), + mListenersRemoved(PR_FALSE), + mSingleListenerType(eEventArrayType_None), + mSingleListener(nsnull), + mMultiListeners(nsnull), + mGenericListeners(nsnull), + mTarget(nsnull) { - mManagerType = NS_ELM_NONE; - mSingleListener = nsnull; - mSingleListenerType = eEventArrayType_None; - mMultiListeners = nsnull; - mGenericListeners = nsnull; - mListenersRemoved = PR_FALSE; - - mTarget = nsnull; ++mInstanceCount; } diff --git a/mozilla/content/events/src/nsEventListenerManager.h b/mozilla/content/events/src/nsEventListenerManager.h index 0a752dff575..fe143e7e87f 100644 --- a/mozilla/content/events/src/nsEventListenerManager.h +++ b/mozilla/content/events/src/nsEventListenerManager.h @@ -222,14 +222,14 @@ protected: nsresult GetDOM2EventGroup(nsIDOMEventGroup** aGroup); PRUint8 mManagerType; + PRPackedBool mListenersRemoved; + EventArrayType mSingleListenerType; nsVoidArray* mSingleListener; nsVoidArray* mMultiListeners; nsHashtable* mGenericListeners; - PRBool mListenersRemoved; static PRUint32 mInstanceCount; - nsCOMPtr mPrincipal; nsISupports* mTarget; //WEAK static jsval sAddListenerID;