From 9b45a956e6ae2b2241de0f4396a69b35a06b24da Mon Sep 17 00:00:00 2001
From: "caillon%returnzero.com"
 <caillon%returnzero.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 22 Jun 2003 13:12:14 +0000
Subject: [PATCH] [Bug 210254] nsEventListenerManager::mPrincipal is unused. 
 Also reorganizes some members to better align them. r+sr=bzbarsky.

git-svn-id: svn://10.0.0.236/trunk@144040 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../events/src/nsEventListenerManager.cpp       | 17 ++++++++---------
 .../content/events/src/nsEventListenerManager.h |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

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<nsIPrincipal> mPrincipal;
   nsISupports* mTarget;  //WEAK
 
   static jsval sAddListenerID;