Bug 1035394 - Fix dangerous public destructors in widget - r=roc

widget/cocoa/GfxInfo.h

@@ -57,6 +57,8 @@ public:
 
 protected:
 
+  virtual ~GfxInfo() {}
+
   virtual nsresult GetFeatureStatusImpl(int32_t aFeature, 
                                         int32_t *aStatus, 
                                         nsAString & aSuggestedDriverVersion, 

widget/cocoa/nsChildView.h

@@ -405,7 +405,6 @@ private:
 
 public:
   nsChildView();
-  virtual                 ~nsChildView();
 
   NS_DECL_ISUPPORTS_INHERITED
 
@@ -595,6 +594,7 @@ public:
   APZCTreeManager* APZCTM() { return mAPZCTreeManager; }
 
 protected:
+  virtual ~nsChildView();
 
   void              ReportMoveEvent();
   void              ReportSizeEvent();

widget/cocoa/nsCocoaWindow.h

@@ -236,7 +236,6 @@ private:
 public:
 
     nsCocoaWindow();
-    virtual ~nsCocoaWindow();
 
     NS_DECL_ISUPPORTS_INHERITED
     NS_DECL_NSPIWIDGETCOCOA
@@ -352,6 +351,7 @@ public:
 
     NS_IMETHOD         ReparentNativeWidget(nsIWidget* aNewParent);
 protected:
+  virtual ~nsCocoaWindow();
 
   nsresult             CreateNativeWindow(const NSRect &aRect,
                                           nsBorderStyle aBorderStyle,

widget/cocoa/nsDragService.h

@@ -19,7 +19,6 @@ class nsDragService : public nsBaseDragService
 {
 public:
   nsDragService();
-  virtual ~nsDragService();
 
   // nsIDragService
   NS_IMETHOD InvokeDragSession(nsIDOMNode *aDOMNode, nsISupportsArray * anArrayTransferables,
@@ -31,6 +30,9 @@ public:
   NS_IMETHOD IsDataFlavorSupported(const char *aDataFlavor, bool *_retval);
   NS_IMETHOD GetNumDropItems(uint32_t * aNumItems);
 
+protected:
+  virtual ~nsDragService();
+
 private:
 
   NSImage* ConstructDragImage(nsIDOMNode* aDOMNode,

widget/cocoa/nsNativeThemeCocoa.h

@@ -29,7 +29,6 @@ class nsNativeThemeCocoa : private nsNativeTheme,
 {
 public:
   nsNativeThemeCocoa();
-  virtual ~nsNativeThemeCocoa();
 
   NS_DECL_ISUPPORTS_INHERITED
 
@@ -70,6 +69,7 @@ public:
                     double inValue, double inMaxValue, nsIFrame* aFrame);
 
 protected:
+  virtual ~nsNativeThemeCocoa();
 
   nsIntMargin RTLAwareMargin(const nsIntMargin& aMargin, nsIFrame* aFrame);
   nsIFrame* SeparatorResponsibility(nsIFrame* aBefore, nsIFrame* aAfter);

widget/cocoa/nsPrintSettingsX.h

@@ -20,7 +20,6 @@ public:
   NS_DECL_ISUPPORTS_INHERITED
 
   nsPrintSettingsX();
-  virtual ~nsPrintSettingsX();
   nsresult Init();
   NSPrintInfo* GetCocoaPrintInfo() { return mPrintInfo; }
   void SetCocoaPrintInfo(NSPrintInfo* aPrintInfo);
@@ -33,6 +32,8 @@ public:
   void SetPMPageFormat(PMPageFormat aPageFormat);
 
 protected:
+  virtual ~nsPrintSettingsX();
+
   nsPrintSettingsX(const nsPrintSettingsX& src);
   nsPrintSettingsX& operator=(const nsPrintSettingsX& rhs);
 

widget/gtk/nsDragService.h

@@ -53,7 +53,6 @@ class nsDragService : public nsBaseDragService,
 {
 public:
     nsDragService();
-    virtual ~nsDragService();
 
     NS_DECL_ISUPPORTS_INHERITED
 
@@ -119,6 +118,9 @@ public:
     // set the drag icon during drag-begin
     void SetDragIcon(GdkDragContext* aContext);
 
+protected:
+    virtual ~nsDragService();
+
 private:
 
     // mScheduledTask indicates what signal has been received from GTK and

widget/gtk/nsNativeThemeGTK.h

@@ -62,6 +62,8 @@ public:
                                              uint8_t aWidgetType);
 
   nsNativeThemeGTK();
+
+protected:
   virtual ~nsNativeThemeGTK();
 
 private:

widget/gtk/nsPrintSettingsGTK.h

@@ -34,7 +34,6 @@ public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_PRINTSETTINGSGTK_IID)
 
   nsPrintSettingsGTK();
-  virtual ~nsPrintSettingsGTK();
 
   // We're overriding these methods because we want to read/write with GTK objects,
   // not local variables. This allows a simpler settings implementation between
@@ -120,6 +119,8 @@ public:
   NS_IMETHOD SetDuplex(int32_t aDuplex);
 
 protected:
+  virtual ~nsPrintSettingsGTK();
+
   nsPrintSettingsGTK(const nsPrintSettingsGTK& src);
   nsPrintSettingsGTK& operator=(const nsPrintSettingsGTK& rhs);
 

widget/gtk/nsWindow.h

@@ -75,7 +75,6 @@ class nsWindow : public nsBaseWidget, public nsSupportsWeakReference
 {
 public:
     nsWindow();
-    virtual ~nsWindow();
 
     static void ReleaseGlobals();
 
@@ -298,6 +297,8 @@ public:
     { return SynthesizeNativeMouseEvent(aPoint, GDK_MOTION_NOTIFY, 0); }
 
 protected:
+    virtual ~nsWindow();
+
     // event handling code
     void DispatchActivateEvent(void);
     void DispatchDeactivateEvent(void);

widget/xpwidgets/GfxInfoX11.h

@@ -52,6 +52,7 @@ public:
 #endif
 
 protected:
+  ~GfxInfo() {}
 
   virtual nsresult GetFeatureStatusImpl(int32_t aFeature, 
                                         int32_t *aStatus, 

widget/xpwidgets/PuppetWidget.h

@@ -48,8 +48,11 @@ class PuppetWidget : public nsBaseWidget, public nsSupportsWeakReference
 
 public:
   PuppetWidget(TabChild* aTabChild);
+
+protected:
   virtual ~PuppetWidget();
 
+public:
   NS_DECL_ISUPPORTS_INHERITED
 
   NS_IMETHOD Create(nsIWidget*        aParent,