Bug 229875 - eliminate unnecssary public/virtual destructors. This patch changes all refcounted classes under xpcom/, which aren't inherited from or used on the stack, to have private, nonvirtual destructors. r=dougt, sr=dbaron.

Author: bryner%brianryner.com

xpcom/base/nsConsoleMessage.cpp

@@ -53,8 +53,6 @@ nsConsoleMessage::nsConsoleMessage(const PRUnichar *message)
 	mMessage.Assign(message);
 }
 
-nsConsoleMessage::~nsConsoleMessage() {}
-
 NS_IMETHODIMP
 nsConsoleMessage::GetMessage(PRUnichar **result) {
     *result = ToNewUnicode(mMessage);

xpcom/base/nsConsoleMessage.h

@@ -46,12 +46,12 @@ class nsConsoleMessage : public nsIConsoleMessage {
     nsConsoleMessage();
     nsConsoleMessage(const PRUnichar *message);
 
-    virtual ~nsConsoleMessage();
-
     NS_DECL_ISUPPORTS
     NS_DECL_NSICONSOLEMESSAGE
 
 private:
+    ~nsConsoleMessage() {}
+
     nsString mMessage;
 };
 

xpcom/base/nsConsoleService.h

@@ -52,12 +52,13 @@ class nsConsoleService : public nsIConsoleService
 {
 public:
     nsConsoleService();
-    virtual ~nsConsoleService();
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSICONSOLESERVICE
 
 private:
+    ~nsConsoleService();
+
     // build (or find) a proxy for the listener
     nsresult GetProxyForListener(nsIConsoleListener* aListener,
                                  nsIConsoleListener** aProxy);

xpcom/base/nsDebugImpl.cpp

@@ -148,10 +148,6 @@ nsDebugImpl::nsDebugImpl()
 {
 }
 
-nsDebugImpl::~nsDebugImpl()
-{
-}
-
 /**
  * Implementation of the nsDebug methods. Note that this code is
  * always compiled in, in case some other module that uses it is

xpcom/base/nsDebugImpl.h

@@ -43,8 +43,10 @@ class nsDebugImpl : public nsIDebug
     NS_DECL_NSIDEBUG
 
     nsDebugImpl();
-    virtual ~nsDebugImpl();
     static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr);
+
+private:
+    ~nsDebugImpl() {}
 };
 
 

xpcom/base/nsErrorService.h

@@ -62,11 +62,13 @@ class nsErrorService : public nsIErrorService
     NS_DECL_NSIERRORSERVICE
 
     nsErrorService() {}
-    virtual ~nsErrorService() {}
 
     static NS_METHOD
     Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr);
 
+private:
+    ~nsErrorService() {}
+
 protected:
     nsInt2StrHashtable mErrorStringBundleURLMap;
     nsInt2StrHashtable mErrorStringBundleKeyMap;

xpcom/base/nsExceptionService.cpp

@@ -73,14 +73,16 @@ class nsExceptionManager : public nsIExceptionManager
   NS_DECL_NSIEXCEPTIONMANAGER
 
   nsExceptionManager(nsExceptionService *svc);
-  virtual ~nsExceptionManager();
   /* additional members */
   nsCOMPtr<nsIException> mCurrentException;
   nsExceptionManager *mNextThread; // not ref-counted.
   nsExceptionService *mService; // not ref-counted
 #ifdef NS_DEBUG
   static PRInt32 totalInstances;
 #endif
+
+private:
+  ~nsExceptionManager();
 };
 
 

xpcom/base/nsExceptionService.h

@@ -58,7 +58,6 @@ class nsExceptionService : public nsIExceptionService, public nsIObserver
   NS_DECL_NSIOBSERVER
 
   nsExceptionService();
-  virtual ~nsExceptionService();
 
   /* additional members */
   nsresult DoGetExceptionFromProvider(nsresult errCode,
@@ -86,6 +85,9 @@ class nsExceptionService : public nsIExceptionService, public nsIObserver
 #ifdef NS_DEBUG
   static PRInt32 totalInstances;
 #endif
+
+private:
+  ~nsExceptionService();
 };
 
 

xpcom/base/nsLeakDetector.cpp

@@ -75,17 +75,17 @@ static FILE* openTraceFile()
 class nsLeakDetector : public nsILeakDetector {
 public:
 	nsLeakDetector();
-	virtual ~nsLeakDetector();
 
 	NS_DECL_ISUPPORTS	
 	NS_DECL_NSILEAKDETECTOR
+private:
+	~nsLeakDetector() {}
 };
 
 NS_IMPL_ISUPPORTS1(nsLeakDetector, nsILeakDetector)
 
 nsLeakDetector::nsLeakDetector() {
    }
-nsLeakDetector::~nsLeakDetector() {}
 
 NS_METHOD nsLeakDetector::DumpLeaks()
 {

xpcom/base/nsMemoryImpl.cpp

@@ -77,12 +77,14 @@ class MemoryFlusher : public nsIRunnable
     PRCondVar*     mCVar;
 
     MemoryFlusher(nsMemoryImpl* aMemoryImpl);
-    virtual ~MemoryFlusher();
 
     enum {
         kInitialTimeout = 60 /*seconds*/
     };
 
+private:
+    ~MemoryFlusher();
+
 public:
     /**
      * Create a memory flusher.