Bug 1028588 - Fix dangerous public destructors in xpfe/ - r=ndeakin

xpfe/appshell/src/nsAppShellService.cpp

@@ -214,8 +214,9 @@ nsAppShellService::CreateTopLevelWindow(nsIXULWindow *aParent,
 class WebBrowserChrome2Stub : public nsIWebBrowserChrome2,
                               public nsIInterfaceRequestor,
                               public nsSupportsWeakReference {
-public:
+protected:
     virtual ~WebBrowserChrome2Stub() {}
+public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIWEBBROWSERCHROME
     NS_DECL_NSIWEBBROWSERCHROME2
@@ -332,6 +333,7 @@ public:
   NS_FORWARD_NSIWEBNAVIGATION(mWebNavigation->)
   NS_FORWARD_NSIINTERFACEREQUESTOR(mInterfaceRequestor->)
 private:
+  ~WindowlessBrowserStub() {}
   nsCOMPtr<nsIWebBrowser> mBrowser;
   nsCOMPtr<nsIWebNavigation> mWebNavigation;
   nsCOMPtr<nsIInterfaceRequestor> mInterfaceRequestor;

xpfe/appshell/src/nsAppShellWindowEnumerator.h

@@ -50,7 +50,6 @@ friend class nsWindowMediator;
 public:
   nsAppShellWindowEnumerator(const char16_t* aTypeString,
                              nsWindowMediator& inMediator);
-  virtual ~nsAppShellWindowEnumerator();
   NS_IMETHOD GetNext(nsISupports **retval) = 0;
   NS_IMETHOD HasMoreElements(bool *retval);
 
@@ -58,6 +57,8 @@ public:
 
 protected:
 
+  virtual ~nsAppShellWindowEnumerator();
+
   void AdjustInitialPosition();
   virtual nsWindowInfo *FindNext() = 0;
 

xpfe/appshell/src/nsContentTreeOwner.cpp

@@ -68,6 +68,14 @@ private:
   nsContentTreeOwner *mAggregator;
 };
 
+namespace mozilla {
+template<>
+struct HasDangerousPublicDestructor<nsSiteWindow>
+{
+  static const bool value = true;
+};
+}
+
 //*****************************************************************************
 //***    nsContentTreeOwner: Object Management
 //*****************************************************************************

xpfe/appshell/src/nsWebShellWindow.cpp

@@ -460,6 +460,8 @@ public:
   }
 
 private:
+  ~WebShellWindowTimerCallback() {}
+
   nsRefPtr<nsWebShellWindow> mWindow;
 };
 

xpfe/appshell/src/nsWindowMediator.h

@@ -39,9 +39,11 @@ friend class nsASXULWindowFrontToBackEnumerator;
 friend class nsASDOMWindowBackToFrontEnumerator;
 friend class nsASXULWindowBackToFrontEnumerator;
 
+protected:
+  virtual ~nsWindowMediator();
+
 public:
   nsWindowMediator();
-  virtual ~nsWindowMediator();
 
   nsresult Init();
 

xpfe/components/directory/nsDirectoryViewer.h

@@ -25,11 +25,13 @@ class nsDirectoryViewerFactory : public nsIDocumentLoaderFactory
 {
 public:
     nsDirectoryViewerFactory();
-    virtual ~nsDirectoryViewerFactory();
 
     // nsISupports interface
     NS_DECL_ISUPPORTS
     NS_DECL_NSIDOCUMENTLOADERFACTORY
+
+protected:
+    virtual ~nsDirectoryViewerFactory();
 };
 
 class nsHTTPIndex : public nsIHTTPIndex,
@@ -87,9 +89,10 @@ protected:
 
     static void FireTimer(nsITimer* aTimer, void* aClosure);
 
+    virtual ~nsHTTPIndex();
+
 public:
     nsHTTPIndex();
-    virtual ~nsHTTPIndex();
     nsresult Init(void);
 
     static nsresult Create(nsIURI* aBaseURI, nsIInterfaceRequestor* aContainer,

xpfe/components/windowds/nsWindowDataSource.h

@@ -27,7 +27,6 @@ class nsWindowDataSource : public nsIRDFDataSource,
 {
  public:
     nsWindowDataSource() { }
-    virtual ~nsWindowDataSource();
 
     nsresult Init();
 
@@ -39,6 +38,9 @@ class nsWindowDataSource : public nsIRDFDataSource,
     NS_DECL_NSIWINDOWDATASOURCE
     NS_DECL_NSIRDFDATASOURCE
 
+ protected:
+    virtual ~nsWindowDataSource();
+
  private:
 
     // mapping of window -> RDF resource