Bug 1028588 - Fix dangerous public destructors in the rest of dom/ - r=ehsan

dom/alarm/AlarmHalService.h

@@ -30,7 +30,6 @@ public:
   NS_DECL_NSIALARMHALSERVICE
 
   void Init();
-  virtual ~AlarmHalService();
 
   static already_AddRefed<AlarmHalService> GetInstance();
 
@@ -41,6 +40,8 @@ public:
   void Notify(const hal::SystemTimezoneChangeInformation& aSystemTimezoneChangeInfo);
 
 private:
+  virtual ~AlarmHalService();
+
   bool mAlarmEnabled;
   static StaticRefPtr<AlarmHalService> sSingleton;
 

dom/animation/AnimationTimeline.h

@@ -26,8 +26,6 @@ public:
     SetIsDOMBinding();
   }
 
-  virtual ~AnimationTimeline() { }
-
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(AnimationTimeline)
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(AnimationTimeline)
 
@@ -37,6 +35,8 @@ public:
   Nullable<double> GetCurrentTime() const;
 
 protected:
+  virtual ~AnimationTimeline() { }
+
   nsCOMPtr<nsIDocument> mDocument;
 };
 

dom/archivereader/ArchiveEvent.h

@@ -27,7 +27,6 @@ public:
   NS_DECL_THREADSAFE_ISUPPORTS
 
   ArchiveItem();
-  virtual ~ArchiveItem();
 
   // Getter/Setter for the type
   nsCString GetType();
@@ -40,6 +39,8 @@ public:
   virtual nsIDOMFile* File(ArchiveReader* aArchiveReader) = 0;
 
 protected:
+  virtual ~ArchiveItem();
+
   nsCString mType;
 };
 

dom/archivereader/ArchiveZipFile.cpp

@@ -43,17 +43,17 @@ public:
     mData.inputStream = aInputStream;
   }
 
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSIINPUTSTREAM
+  NS_DECL_NSISEEKABLESTREAM
+
+private:
   virtual ~ArchiveInputStream()
   {
     MOZ_COUNT_DTOR(ArchiveInputStream);
     Close();
   }
 
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSIINPUTSTREAM
-  NS_DECL_NSISEEKABLESTREAM
-
-private:
   nsresult Init();
 
 private: // data

dom/asmjscache/AsmJSCache.cpp

@@ -1723,6 +1723,8 @@ GetBuildId(JS::BuildIdCharVector* aBuildID)
 
 class Client : public quota::Client
 {
+  ~Client() {}
+
 public:
   NS_IMETHOD_(MozExternalRefCountType)
   AddRef() MOZ_OVERRIDE;

dom/audiochannel/tests/TestAudioChannelService.cpp

@@ -28,6 +28,14 @@ using namespace mozilla::dom;
 class Agent : public nsIAudioChannelAgentCallback,
               public nsSupportsWeakReference
 {
+protected:
+  virtual ~Agent()
+  {
+    if (mRegistered) {
+      StopPlaying();
+    }
+  }
+
 public:
   NS_DECL_ISUPPORTS
 
@@ -40,13 +48,6 @@ public:
     mAgent = do_CreateInstance("@mozilla.org/audiochannelagent;1");
   }
 
-  virtual ~Agent()
-  {
-    if (mRegistered) {
-      StopPlaying();
-    }
-  }
-
   nsresult Init(bool video=false)
   {
     nsresult rv = NS_OK;

dom/base/BarProps.h

@@ -33,7 +33,6 @@ class BarProp : public nsISupports,
 {
 public:
   explicit BarProp(nsGlobalWindow *aWindow);
-  virtual ~BarProp();
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(BarProp)
@@ -47,6 +46,8 @@ public:
   virtual void SetVisible(bool aVisible, ErrorResult& aRv) = 0;
 
 protected:
+  virtual ~BarProp();
+
   bool GetVisibleByFlag(uint32_t aChromeFlag, ErrorResult& aRv);
   void SetVisibleByFlag(bool aVisible, uint32_t aChromeFlag, ErrorResult &aRv);
 

dom/base/CompositionStringSynthesizer.h

@@ -23,12 +23,13 @@ class CompositionStringSynthesizer MOZ_FINAL :
 {
 public:
   CompositionStringSynthesizer(nsPIDOMWindow* aWindow);
-  ~CompositionStringSynthesizer();
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSICOMPOSITIONSTRINGSYNTHESIZER
 
 private:
+  ~CompositionStringSynthesizer();
+
   nsWeakPtr mWindow; // refers an instance of nsPIDOMWindow
   nsString mString;
   nsRefPtr<TextRangeArray> mClauses;

dom/base/Console.h

@@ -28,6 +28,8 @@ class Console MOZ_FINAL : public nsITimerCallback
                         , public nsIObserver
                         , public nsWrapperCache
 {
+  ~Console();
+
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(Console,
@@ -36,7 +38,6 @@ public:
   NS_DECL_NSIOBSERVER
 
   Console(nsPIDOMWindow* aWindow);
-  ~Console();
 
   // WebIDL methods
   nsISupports* GetParentObject() const

dom/base/Crypto.h

@@ -32,9 +32,11 @@ namespace dom {
 class Crypto : public nsIDOMCrypto,
                public nsWrapperCache
 {
+protected:
+  virtual ~Crypto();
+
 public:
   Crypto();
-  virtual ~Crypto();
 
   NS_DECL_NSIDOMCRYPTO
 

dom/base/DOMError.h

@@ -32,6 +32,9 @@ class DOMError : public nsISupports,
   nsString mName;
   nsString mMessage;
 
+protected:
+  virtual ~DOMError();
+
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMError)
@@ -50,8 +53,6 @@ public:
   DOMError(nsPIDOMWindow* aWindow, const nsAString& aName,
            const nsAString& aMessage);
 
-  virtual ~DOMError();
-
   nsPIDOMWindow* GetParentObject() const
   {
     return mWindow;

dom/base/DOMRequest.h

@@ -89,6 +89,8 @@ protected:
 
 class DOMRequestService MOZ_FINAL : public nsIDOMRequestService
 {
+  ~DOMRequestService() {}
+
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMREQUESTSERVICE

dom/base/MessageChannel.h

@@ -33,8 +33,6 @@ public:
 public:
   MessageChannel(nsPIDOMWindow* aWindow);
 
-  ~MessageChannel();
-
   nsPIDOMWindow*
   GetParentObject() const
   {
@@ -60,6 +58,8 @@ public:
   }
 
 private:
+  ~MessageChannel();
+
   nsCOMPtr<nsPIDOMWindow> mWindow;
 
   nsRefPtr<MessagePort> mPort1;

dom/base/MessagePortList.h

@@ -21,6 +21,8 @@ namespace dom {
 class MessagePortList MOZ_FINAL : public nsISupports
                                 , public nsWrapperCache
 {
+  ~MessagePortList() {}
+
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MessagePortList)

dom/base/Navigator.cpp

@@ -689,16 +689,16 @@ public:
                                       false /* wants untrusted */);
   }
 
-  virtual ~VibrateWindowListener()
-  {
-  }
-
   void RemoveListener();
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMEVENTLISTENER
 
 private:
+  virtual ~VibrateWindowListener()
+  {
+  }
+
   nsWeakPtr mWindow;
   nsWeakPtr mDocument;
 };
@@ -1056,6 +1056,8 @@ Navigator::GetGeolocation(ErrorResult& aRv)
 
 class BeaconStreamListener MOZ_FINAL : public nsIStreamListener
 {
+    ~BeaconStreamListener() {}
+
   public:
     BeaconStreamListener() {}
 

dom/base/Navigator.h

@@ -114,7 +114,6 @@ class Navigator : public nsIDOMNavigator
 {
 public:
   Navigator(nsPIDOMWindow *aInnerWindow);
-  virtual ~Navigator();
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(Navigator,
@@ -303,6 +302,8 @@ public:
   virtual JSObject* WrapObject(JSContext* cx) MOZ_OVERRIDE;
 
 private:
+  virtual ~Navigator();
+
   bool CheckPermission(const char* type);
   static bool CheckPermission(nsPIDOMWindow* aWindow, const char* aType);
   // GetWindowFromGlobal returns the inner window for this global, if

dom/base/PerformanceEntry.h

@@ -16,9 +16,11 @@ namespace dom {
 class PerformanceEntry : public nsISupports,
                          public nsWrapperCache
 {
+protected:
+  virtual ~PerformanceEntry();
+
 public:
   PerformanceEntry(nsPerformance* aPerformance);
-  virtual ~PerformanceEntry();
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(PerformanceEntry)

dom/base/SubtleCrypto.h

@@ -25,6 +25,8 @@ typedef ArrayBufferViewOrArrayBuffer KeyData;
 class SubtleCrypto MOZ_FINAL : public nsISupports,
                                public nsWrapperCache
 {
+  ~SubtleCrypto() {}
+
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(SubtleCrypto)

dom/base/URL.h

@@ -32,6 +32,8 @@ class URLProxy;
 
 class URL MOZ_FINAL : public URLSearchParamsObserver
 {
+  ~URL() {}
+
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_CLASS(URL)

dom/base/URLSearchParams.h

@@ -28,12 +28,13 @@ public:
 class URLSearchParams MOZ_FINAL : public nsISupports,
                                   public nsWrapperCache
 {
+  ~URLSearchParams();
+
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(URLSearchParams)
 
   URLSearchParams();
-  ~URLSearchParams();
 
   // WebIDL methods
   nsISupports* GetParentObject() const

dom/base/nsContentPermissionHelper.h

@@ -38,9 +38,10 @@ public:
   ContentPermissionType(const nsACString& aType,
                         const nsACString& aAccess,
                         const nsTArray<nsString>& aOptions);
-  virtual ~ContentPermissionType();
 
 protected:
+  virtual ~ContentPermissionType();
+
   nsCString mType;
   nsCString mAccess;
   nsTArray<nsString> mOptions;
@@ -69,13 +70,14 @@ class nsContentPermissionRequestProxy : public nsIContentPermissionRequest
   NS_DECL_NSICONTENTPERMISSIONREQUEST
 
   nsContentPermissionRequestProxy();
-  virtual ~nsContentPermissionRequestProxy();
 
   nsresult Init(const nsTArray<mozilla::dom::PermissionRequest>& requests,
                 mozilla::dom::ContentPermissionRequestParent* parent);
   void OnParentDestroyed();
 
  private:
+  virtual ~nsContentPermissionRequestProxy();
+
   // Non-owning pointer to the ContentPermissionRequestParent object which owns this proxy.
   mozilla::dom::ContentPermissionRequestParent* mParent;
   nsTArray<mozilla::dom::PermissionRequest> mPermissionRequests;

dom/base/nsDOMClassInfo.cpp

@@ -1965,6 +1965,8 @@ protected:
   {
   }
 
+  ~nsDOMConstructor() {}
+
 public:
 
   static nsresult Create(const char16_t* aName,

dom/base/nsDOMClassInfo.h

@@ -72,9 +72,12 @@ struct nsExternalDOMClassInfoData : public nsDOMClassInfoData
 class nsDOMClassInfo : public nsXPCClassInfo
 {
   friend class nsHTMLDocumentSH;
+
+protected:
+  virtual ~nsDOMClassInfo();
+
 public:
   nsDOMClassInfo(nsDOMClassInfoData* aData);
-  virtual ~nsDOMClassInfo();
 
   NS_DECL_NSIXPCSCRIPTABLE
 
@@ -342,12 +345,12 @@ public:
 
 class nsEventListenerThisTranslator : public nsIXPCFunctionThisTranslator
 {
-public:
-  nsEventListenerThisTranslator()
+  virtual ~nsEventListenerThisTranslator()
   {
   }
 
-  virtual ~nsEventListenerThisTranslator()
+public:
+  nsEventListenerThisTranslator()
   {
   }
 

dom/base/nsDOMScriptObjectFactory.h

@@ -25,6 +25,8 @@
 class nsDOMScriptObjectFactory MOZ_FINAL : public nsIDOMScriptObjectFactory,
                                            public nsIObserver
 {
+  ~nsDOMScriptObjectFactory() {}
+
 public:
   nsDOMScriptObjectFactory();
 

dom/base/nsDOMWindowList.h

@@ -17,7 +17,6 @@ class nsDOMWindowList : public nsIDOMWindowCollection
 {
 public:
   nsDOMWindowList(nsIDocShell *aDocShell);
-  virtual ~nsDOMWindowList();
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMWINDOWCOLLECTION
@@ -38,6 +37,8 @@ public:
   }
 
 protected:
+  virtual ~nsDOMWindowList();
+
   // Note: this function may flush and cause mDocShellNode to become null.
   void EnsureFresh();
 

dom/base/nsDOMWindowUtils.h

@@ -46,6 +46,8 @@ public:
   }
 
 private:
+  ~nsTranslationNodeList() {}
+
   nsTArray<nsCOMPtr<nsIDOMNode> > mNodes;
   nsTArray<bool> mNodeIsRoot;
   uint32_t mLength;
@@ -56,11 +58,12 @@ class nsDOMWindowUtils MOZ_FINAL : public nsIDOMWindowUtils,
 {
 public:
   nsDOMWindowUtils(nsGlobalWindow *aWindow);
-  ~nsDOMWindowUtils();
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMWINDOWUTILS
 
 protected:
+  ~nsDOMWindowUtils();
+
   nsWeakPtr mWindow;
 
   // If aOffset is non-null, it gets filled in with the offset of the root

dom/base/nsGlobalWindow.cpp

@@ -503,6 +503,8 @@ public:
   }
 
 private:
+  ~nsGlobalWindowObserver() {}
+
   nsGlobalWindow* mWindow;
 };
 

dom/base/nsGlobalWindow.h

@@ -146,11 +146,15 @@ NS_CreateJSTimeoutHandler(JSContext* aCx, nsGlobalWindow *aWindow,
  * timeout.  Holds a strong reference to an nsIScriptTimeoutHandler, which
  * abstracts the language specific cruft.
  */
-struct nsTimeout : mozilla::LinkedListElement<nsTimeout>
+struct nsTimeout MOZ_FINAL
+  : mozilla::LinkedListElement<nsTimeout>
 {
-  nsTimeout();
+private:
   ~nsTimeout();
 
+public:
+  nsTimeout();
+
   NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(nsTimeout)
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(nsTimeout)
 
@@ -290,8 +294,9 @@ public:
       aResult.setUndefined();
     }
   }
-  virtual ~DialogValueHolder() {}
 private:
+  virtual ~DialogValueHolder() {}
+
   nsCOMPtr<nsIPrincipal> mOrigin;
   nsCOMPtr<nsIVariant> mValue;
 };

dom/base/nsGlobalWindowCommands.cpp

@@ -92,14 +92,13 @@ const char * const sSelectBottomString = "cmd_selectBottom";
 class nsSelectionCommandsBase : public nsIControllerCommand
 {
 public:
-  virtual ~nsSelectionCommandsBase() {}
-
   NS_DECL_ISUPPORTS
   NS_IMETHOD IsCommandEnabled(const char * aCommandName, nsISupports *aCommandContext, bool *_retval);
   NS_IMETHOD GetCommandStateParams(const char * aCommandName, nsICommandParams *aParams, nsISupports *aCommandContext);
   NS_IMETHOD DoCommandParams(const char * aCommandName, nsICommandParams *aParams, nsISupports *aCommandContext);
 
 protected:
+  virtual ~nsSelectionCommandsBase() {}
 
   static nsresult  GetPresShellFromWindow(nsPIDOMWindow *aWindow, nsIPresShell **aPresShell);
   static nsresult  GetSelectionControllerFromWindow(nsPIDOMWindow *aWindow, nsISelectionController **aSelCon);
@@ -323,6 +322,8 @@ nsSelectCommand::DoCommand(const char *aCommandName, nsISupports *aCommandContex
 
 class nsClipboardCommand MOZ_FINAL : public nsIControllerCommand
 {
+  ~nsClipboardCommand() {}
+
 public:
 
   NS_DECL_ISUPPORTS
@@ -387,12 +388,11 @@ nsClipboardCommand::DoCommandParams(const char *aCommandName, nsICommandParams*
 class nsSelectionCommand : public nsIControllerCommand
 {
 public:
-  virtual ~nsSelectionCommand() {}
-
   NS_DECL_ISUPPORTS
   NS_DECL_NSICONTROLLERCOMMAND
 
 protected:
+  virtual ~nsSelectionCommand() {}
 
   virtual nsresult    IsClipboardCommandEnabled(const char * aCommandName, nsIContentViewerEdit* aEdit, bool *outCmdEnabled) = 0;
   virtual nsresult    DoClipboardCommand(const char *aCommandName, nsIContentViewerEdit* aEdit, nsICommandParams* aParams) = 0;
@@ -722,6 +722,8 @@ nsGoBackCommand::DoWebNavCommand(const char *aCommandName, nsIWebNavigation* aWe
 
 class nsClipboardDragDropHookCommand MOZ_FINAL : public nsIControllerCommand
 {
+  ~nsClipboardDragDropHookCommand() {}
+
 public:
 
   NS_DECL_ISUPPORTS

dom/base/nsHistory.h

@@ -31,7 +31,6 @@ public:
 
 public:
   nsHistory(nsPIDOMWindow* aInnerWindow);
-  virtual ~nsHistory();
 
   nsPIDOMWindow* GetParentObject() const;
   virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
@@ -50,6 +49,8 @@ public:
                     mozilla::ErrorResult& aRv);
 
 protected:
+  virtual ~nsHistory();
+
   nsIDocShell* GetDocShell() const;
 
   void PushOrReplaceState(JSContext* aCx, JS::Handle<JS::Value> aData,

dom/base/nsJSEnvironment.cpp

@@ -260,6 +260,7 @@ NeedsGCAfterCC()
 
 class nsJSEnvironmentObserver MOZ_FINAL : public nsIObserver
 {
+  ~nsJSEnvironmentObserver() {}
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBSERVER
@@ -3079,6 +3080,16 @@ mozilla::dom::ShutdownJSEnvironment()
   sDidShutdown = true;
 }
 
+class nsJSArgArray;
+
+namespace mozilla {
+template<>
+struct HasDangerousPublicDestructor<nsJSArgArray>
+{
+  static const bool value = true;
+};
+}
+
 // A fast-array class for JS.  This class supports both nsIJSScriptArray and
 // nsIArray.  If it is JS itself providing and consuming this class, all work
 // can be done via nsIJSScriptArray, and avoid the conversion of elements

dom/base/nsJSEnvironment.h

@@ -38,7 +38,6 @@ class nsJSContext : public nsIScriptContext
 {
 public:
   nsJSContext(bool aGCOnDestruction, nsIScriptGlobalObject* aGlobalObject);
-  virtual ~nsJSContext();
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsJSContext,
@@ -134,6 +133,8 @@ public:
     return global ? mGlobalObjectRef.get() : nullptr;
   }
 protected:
+  virtual ~nsJSContext();
+
   // Helper to convert xpcom datatypes to jsvals.
   nsresult ConvertSupportsTojsvals(nsISupports *aArgs,
                                    JS::Handle<JSObject*> aScope,

dom/base/nsJSTimeoutHandler.cpp

@@ -41,7 +41,6 @@ public:
   nsJSScriptTimeoutHandler(JSContext* aCx, nsGlobalWindow *aWindow,
                            const nsAString& aExpression, bool* aAllowEval,
                            ErrorResult& aError);
-  ~nsJSScriptTimeoutHandler();
 
   virtual const char16_t *GetHandlerText();
   virtual Function* GetCallback()
@@ -65,6 +64,8 @@ public:
   void ReleaseJSObjects();
 
 private:
+  ~nsJSScriptTimeoutHandler();
+
   // filename, line number and JS language version string of the
   // caller of setTimeout()
   nsCString mFileName;

dom/base/nsLocation.h

@@ -27,7 +27,6 @@ class nsLocation : public nsIDOMLocation
 {
 public:
   nsLocation(nsIDocShell *aDocShell);
-  virtual ~nsLocation();
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsLocation)
@@ -39,6 +38,8 @@ public:
   NS_DECL_NSIDOMLOCATION
 
 protected:
+  virtual ~nsLocation();
+
   // In the case of jar: uris, we sometimes want the place the jar was
   // fetched from as the URI instead of the jar: uri itself.  Pass in
   // true for aGetInnermostURI when that's the case.

dom/base/nsMimeTypeArray.h

@@ -21,7 +21,6 @@ class nsMimeTypeArray MOZ_FINAL : public nsISupports,
 {
 public:
   nsMimeTypeArray(nsPIDOMWindow* aWindow);
-  virtual ~nsMimeTypeArray();
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsMimeTypeArray)
@@ -41,6 +40,8 @@ public:
   void GetSupportedNames(unsigned, nsTArray< nsString >& retval);
 
 protected:
+  virtual ~nsMimeTypeArray();
+
   void EnsurePluginMimeTypes();
   void Clear();
 
@@ -67,8 +68,6 @@ public:
   nsMimeType(nsPIDOMWindow* aWindow, nsPluginElement* aPluginElement,
              uint32_t aPluginTagMimeIndex, const nsAString& aMimeType);
   nsMimeType(nsPIDOMWindow* aWindow, const nsAString& aMimeType);
-  virtual ~nsMimeType();
-
   nsPIDOMWindow* GetParentObject() const;
   virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
 
@@ -84,6 +83,8 @@ public:
   void GetType(nsString& retval) const;
 
 protected:
+  virtual ~nsMimeType();
+
   nsCOMPtr<nsPIDOMWindow> mWindow;
 
   // Strong reference to the active plugin, if any. Note that this

dom/base/nsPluginArray.h

@@ -30,8 +30,6 @@ public:
   NS_DECL_NSIOBSERVER
 
   nsPluginArray(nsPIDOMWindow* aWindow);
-  virtual ~nsPluginArray();
-
   nsPIDOMWindow* GetParentObject() const;
   virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
 
@@ -57,6 +55,8 @@ public:
   void GetSupportedNames(unsigned, nsTArray<nsString>& aRetval);
 
 private:
+  virtual ~nsPluginArray();
+
   bool AllowPlugins() const;
   void EnsurePlugins();
 
@@ -109,6 +109,8 @@ public:
   nsTArray<nsRefPtr<nsMimeType> >& MimeTypes();
 
 protected:
+  ~nsPluginElement() {}
+
   void EnsurePluginMimeTypes();
 
   nsCOMPtr<nsPIDOMWindow> mWindow;

dom/base/nsQueryContentEventResult.h

@@ -18,7 +18,6 @@ class nsQueryContentEventResult MOZ_FINAL : public nsIQueryContentEventResult
 {
 public:
   nsQueryContentEventResult();
-  ~nsQueryContentEventResult();
   NS_DECL_ISUPPORTS
   NS_DECL_NSIQUERYCONTENTEVENTRESULT
 
@@ -26,6 +25,8 @@ public:
                       const mozilla::WidgetQueryContentEvent &aEvent);
 
 protected:
+  ~nsQueryContentEventResult();
+
   uint32_t mEventID;
 
   uint32_t mOffset;

dom/base/nsScreen.h

@@ -136,8 +136,9 @@ protected:
 private:
   class FullScreenEventListener MOZ_FINAL : public nsIDOMEventListener
   {
+    ~FullScreenEventListener() {}
   public:
-    FullScreenEventListener() {};
+    FullScreenEventListener() {}
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSIDOMEVENTLISTENER

dom/base/nsScriptNameSpaceManager.h

@@ -95,7 +95,6 @@ public:
   NS_DECL_NSIMEMORYREPORTER
 
   nsScriptNameSpaceManager();
-  virtual ~nsScriptNameSpaceManager();
 
   nsresult Init();
 
@@ -182,6 +181,8 @@ public:
   size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf);
 
 private:
+  virtual ~nsScriptNameSpaceManager();
+
   // Adds a new entry to the hash and returns the nsGlobalNameStruct
   // that aKey will be mapped to. If mType in the returned
   // nsGlobalNameStruct is != eTypeNotInitialized, an entry for aKey

dom/base/nsStructuredCloneContainer.h

@@ -25,12 +25,13 @@ class nsStructuredCloneContainer MOZ_FINAL : public nsIStructuredCloneContainer
 {
   public:
     nsStructuredCloneContainer();
-    ~nsStructuredCloneContainer();
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSISTRUCTUREDCLONECONTAINER
 
   private:
+    ~nsStructuredCloneContainer();
+
     uint64_t* mData;
 
     // This needs to be size_t rather than a PR-type so it matches the JS API.

dom/base/nsWindowMemoryReporter.h

@@ -150,8 +150,6 @@ public:
 
   static void Init();
 
-  ~nsWindowMemoryReporter();
-
 #ifdef DEBUG
   /**
    * Unlink all known ghost windows, to enable investigating what caused them
@@ -161,12 +159,15 @@ public:
 #endif
 
 private:
+  ~nsWindowMemoryReporter();
+
   /**
    * nsGhostWindowReporter generates the "ghost-windows" report, which counts
    * the number of ghost windows present.
    */
   class GhostWindowsReporter MOZ_FINAL : public nsIMemoryReporter
   {
+    ~GhostWindowsReporter() {}
   public:
     NS_DECL_ISUPPORTS
 

dom/base/nsWindowRoot.h

@@ -27,7 +27,6 @@ class nsWindowRoot : public nsPIWindowRoot
 {
 public:
   nsWindowRoot(nsPIDOMWindow* aWindow);
-  virtual ~nsWindowRoot();
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_NSIDOMEVENTTARGET
@@ -66,6 +65,8 @@ public:
                                                          nsIDOMEventTarget)
 
 protected:
+  virtual ~nsWindowRoot();
+
   // Members
   nsCOMPtr<nsPIDOMWindow> mWindow;
   // We own the manager, which owns event listeners attached to us.

dom/camera/DOMCameraManager.cpp

@@ -149,10 +149,6 @@ public:
   {
   }
 
-  virtual ~CameraPermissionRequest()
-  {
-  }
-
   bool Recv__delete__(const bool& aAllow,
                       const InfallibleTArray<PermissionChoice>& choices);
 
@@ -162,6 +158,10 @@ public:
   }
 
 protected:
+  virtual ~CameraPermissionRequest()
+  {
+  }
+
   nsresult DispatchCallback(uint32_t aPermission);
   void CallAllow();
   void CallCancel();

dom/crypto/Key.h

@@ -88,8 +88,6 @@ public:
 
   Key(nsIGlobalObject* aWindow);
 
-  ~Key();
-
   nsIGlobalObject* GetParentObject() const
   {
     return mGlobal;
@@ -156,6 +154,8 @@ public:
   bool ReadStructuredClone(JSStructuredCloneReader* aReader);
 
 private:
+  ~Key();
+
   nsRefPtr<nsIGlobalObject> mGlobal;
   uint32_t mAttributes; // see above
   nsRefPtr<KeyAlgorithm> mAlgorithm;

dom/crypto/KeyAlgorithm.h

@@ -19,6 +19,7 @@ namespace mozilla {
 namespace dom {
 
 class Key;
+class KeyAlgorithm;
 
 enum KeyAlgorithmStructuredCloneTags {
   SCTAG_KEYALG,
@@ -28,6 +29,16 @@ enum KeyAlgorithmStructuredCloneTags {
   SCTAG_RSAHASHEDKEYALG
 };
 
+}
+
+template<>
+struct HasDangerousPublicDestructor<dom::KeyAlgorithm>
+{
+  static const bool value = true;
+};
+
+namespace dom {
+
 class KeyAlgorithm : public nsISupports,
                      public nsWrapperCache
 {

dom/crypto/KeyPair.h

@@ -32,8 +32,6 @@ public:
     SetIsDOMBinding();
   }
 
-  ~KeyPair() {}
-
   nsIGlobalObject* GetParentObject() const
   {
     return mGlobal;
@@ -52,6 +50,8 @@ public:
   }
 
 private:
+  ~KeyPair() {}
+
   nsRefPtr<nsIGlobalObject> mGlobal;
   nsRefPtr<Key> mPublicKey;
   nsRefPtr<Key> mPrivateKey;

dom/datastore/DataStoreCursor.h

@@ -49,6 +49,7 @@ public:
   void SetDataStoreCursorImpl(DataStoreCursorImpl& aCursor);
 
 private:
+  ~DataStoreCursor() {}
   nsRefPtr<DataStoreCursorImpl> mCursor;
 };
 

dom/datastore/DataStoreDB.h

@@ -34,7 +34,6 @@ public:
   NS_DECL_ISUPPORTS
 
   DataStoreDB(const nsAString& aManifestURL, const nsAString& aName);
-  ~DataStoreDB();
 
   nsresult Open(IDBTransactionMode aMode, const Sequence<nsString>& aDb,
                 DataStoreDBCallback* aCallback);
@@ -47,6 +46,8 @@ public:
   NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
 
 private:
+  ~DataStoreDB();
+
   nsresult CreateFactoryIfNeeded();
 
   nsresult UpgradeSchema();

dom/datastore/DataStoreRevision.h

@@ -41,6 +41,7 @@ public:
   NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
 
 private:
+  ~DataStoreRevision() {}
   nsRefPtr<DataStoreRevisionCallback> mCallback;
   nsRefPtr<indexedDB::IDBRequest> mRequest;
   nsString mRevisionID;

dom/datastore/DataStoreService.cpp

@@ -622,6 +622,8 @@ public:
   }
 
 private:
+  ~FirstRevisionIdCallback() {}
+
   nsRefPtr<IDBRequest> mRequest;
 
   nsRefPtr<IDBTransaction> mTxn;

dom/devicestorage/DeviceStorage.h

@@ -39,6 +39,13 @@ class DeviceStorageFileSystem;
 namespace ipc {
 class FileDescriptor;
 }
+
+template<>
+struct HasDangerousPublicDestructor<DeviceStorageFile>
+{
+  static const bool value = true;
+};
+
 } // namespace mozilla
 
 class DeviceStorageFile MOZ_FINAL
@@ -145,6 +152,8 @@ private:
 class FileUpdateDispatcher MOZ_FINAL
   : public nsIObserver
 {
+  ~FileUpdateDispatcher() {}
+
  public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBSERVER

dom/devicestorage/nsDeviceStorage.cpp

@@ -608,12 +608,13 @@ DeviceStorageFile::Init()
 // no convenient way to restart, we use a pref watcher instead.
 class OverrideRootDir MOZ_FINAL : public nsIObserver
 {
+  ~OverrideRootDir();
+
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBSERVER
 
   static OverrideRootDir* GetSingleton();
-  ~OverrideRootDir();
   void Init();
 private:
   static mozilla::StaticRefPtr<OverrideRootDir> sSingleton;
@@ -1752,8 +1753,6 @@ public:
   DeviceStorageCursorRequest(nsDOMDeviceStorageCursor* aCursor)
     : mCursor(aCursor) { }
 
-  ~DeviceStorageCursorRequest() {}
-
   bool Recv__delete__(const bool& allow,
                       const InfallibleTArray<PermissionChoice>& choices)
   {
@@ -1773,6 +1772,8 @@ public:
   }
 
 private:
+  ~DeviceStorageCursorRequest() {}
+
   nsRefPtr<nsDOMDeviceStorageCursor> mCursor;
 };
 
@@ -3146,6 +3147,8 @@ public:
   }
 
 private:
+  ~DeviceStorageRequest() {}
+
   int32_t mRequestType;
   nsCOMPtr<nsPIDOMWindow> mWindow;
   nsCOMPtr<nsIPrincipal> mPrincipal;

dom/events/DOMEventTargetHelper.h

@@ -55,7 +55,6 @@ public:
     SetIsDOMBinding();
   }
 
-  virtual ~DOMEventTargetHelper();
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS(DOMEventTargetHelper)
 
@@ -143,6 +142,8 @@ public:
                                        ErrorResult& aRv,
                                        JSCompartment* aCompartment = nullptr) {}
 protected:
+  virtual ~DOMEventTargetHelper();
+
   nsresult WantsUntrusted(bool* aRetVal);
 
   nsRefPtr<EventListenerManager> mListenerManager;

dom/events/Event.h

@@ -45,6 +45,8 @@ public:
         nsPresContext* aPresContext,
         WidgetEvent* aEvent);
   Event(nsPIDOMWindow* aWindow);
+
+protected:
   virtual ~Event();
 
 private:

dom/events/EventListenerManager.h

@@ -151,6 +151,8 @@ inline EventListenerFlags AllEventsAtSystemGroupCapture()
 
 class EventListenerManager MOZ_FINAL
 {
+  ~EventListenerManager();
+
 public:
   struct Listener
   {
@@ -210,7 +212,6 @@ public:
   };
 
   EventListenerManager(dom::EventTarget* aTarget);
-  virtual ~EventListenerManager();
 
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(EventListenerManager)
 

dom/events/EventListenerService.h

@@ -35,13 +35,13 @@ public:
   {
   }
 
-  virtual ~EventListenerInfo() {}
-
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_CLASS(EventListenerInfo)
   NS_DECL_NSIEVENTLISTENERINFO
 
 protected:
+  virtual ~EventListenerInfo() {}
+
   bool GetJSVal(JSContext* aCx,
                 Maybe<JSAutoCompartment>& aAc,
                 JS::MutableHandle<JS::Value> aJSVal);
@@ -56,6 +56,7 @@ protected:
 
 class EventListenerService MOZ_FINAL : public nsIEventListenerService
 {
+  ~EventListenerService() {}
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIEVENTLISTENERSERVICE

dom/events/EventStateManager.cpp

@@ -199,6 +199,7 @@ public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSITIMERCALLBACK
 private:
+  ~UITimerCallback() {}
   uint32_t mPreviousCount;
 };
 

dom/events/EventStateManager.h

@@ -45,9 +45,10 @@ class TabParent;
 
 class OverOutElementsWrapper MOZ_FINAL : public nsISupports
 {
+  ~OverOutElementsWrapper();
+
 public:
   OverOutElementsWrapper();
-  ~OverOutElementsWrapper();
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_CLASS(OverOutElementsWrapper)
@@ -72,9 +73,10 @@ class EventStateManager : public nsSupportsWeakReference,
   friend class mozilla::ScrollbarsForWheel;
   friend class mozilla::WheelTransaction;
 
+  virtual ~EventStateManager();
+
 public:
   EventStateManager();
-  virtual ~EventStateManager();
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_NSIOBSERVER

dom/events/IMEContentObserver.h

@@ -73,6 +73,8 @@ public:
                                nsIContent** aRoot) const;
 
 private:
+  ~IMEContentObserver() {}
+
   void NotifyContentAdded(nsINode* aContainer, int32_t aStart, int32_t aEnd);
   void ObserveEditableNode();
 

dom/events/JSEventHandler.h

@@ -181,8 +181,6 @@ public:
   JSEventHandler(nsISupports* aTarget, nsIAtom* aType,
                  const TypedEventHandler& aTypedHandler);
 
-  virtual ~JSEventHandler();
-
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
 
   // nsIDOMEventListener interface
@@ -255,6 +253,8 @@ public:
   bool IsBlackForCC();
 
 protected:
+  virtual ~JSEventHandler();
+
   nsISupports* mTarget;
   nsCOMPtr<nsIAtom> mEventName;
   TypedEventHandler mTypedHandler;

dom/events/Touch.h

@@ -45,8 +45,6 @@ public:
         float aRotationAngle,
         float aForce);
 
-  ~Touch();
-
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Touch)
 
@@ -86,6 +84,8 @@ public:
   float mRotationAngle;
   float mForce;
 protected:
+  ~Touch();
+
   bool mPointsInitialized;
 };
 

dom/events/TouchEvent.h

@@ -75,6 +75,8 @@ public:
   Touch* IdentifiedTouch(int32_t aIdentifier) const;
 
 protected:
+  ~TouchList() {}
+
   nsCOMPtr<nsISupports> mParent;
   nsTArray<nsRefPtr<Touch> > mPoints;
 };

dom/filehandle/FileService.cpp

@@ -340,6 +340,10 @@ FileService::FileHandleQueue::FileHandleQueue(FileHandle* aFileHandle)
   MOZ_ASSERT(aFileHandle, "Null pointer!");
 }
 
+FileService::FileHandleQueue::~FileHandleQueue()
+{
+}
+
 NS_IMPL_ADDREF(FileService::FileHandleQueue)
 NS_IMPL_RELEASE(FileService::FileHandleQueue)
 

dom/filehandle/FileService.h

@@ -94,6 +94,8 @@ private:
     inline
     FileHandleQueue(FileHandle* aFileHandle);
 
+    ~FileHandleQueue();
+
     nsresult
     ProcessQueue();
 

dom/filehandle/FileStreamWrappers.cpp

@@ -37,6 +37,8 @@ public:
   }
 
 private:
+  ~ProgressRunnable() {}
+
   nsRefPtr<FileHelper> mFileHelper;
   uint64_t mProgress;
   uint64_t mProgressMax;
@@ -53,6 +55,8 @@ public:
   { }
 
 private:
+  ~CloseRunnable() {}
+
   nsRefPtr<FileHelper> mFileHelper;
 };
 
@@ -67,6 +71,8 @@ public:
   { }
 
 private:
+  ~DestroyRunnable() {}
+
   nsRefPtr<FileHelper> mFileHelper;
 };
 

dom/filehandle/FileStreamWrappers.h

@@ -28,8 +28,6 @@ public:
                     uint64_t aLimit,
                     uint32_t aFlags);
 
-  virtual ~FileStreamWrapper();
-
   enum {
     NOTIFY_PROGRESS = 1 << 0,
     NOTIFY_CLOSE = 1 << 1,
@@ -37,6 +35,8 @@ public:
   };
 
 protected:
+  virtual ~FileStreamWrapper();
+
   nsCOMPtr<nsISupports> mFileStream;
   nsRefPtr<FileHelper> mFileHelper;
   uint64_t mOffset;

dom/filesystem/Directory.h

@@ -48,7 +48,6 @@ public:
   GetRoot(FileSystemBase* aFileSystem);
 
   Directory(FileSystemBase* aFileSystem, const nsAString& aPath);
-  ~Directory();
 
   // ========= Begin WebIDL bindings. ===========
 
@@ -81,6 +80,8 @@ public:
   FileSystemBase*
   GetFileSystem() const;
 private:
+  ~Directory();
+
   static bool
   IsValidRelativePath(const nsString& aPath);
 

dom/indexedDB/CheckPermissionsHelper.h

@@ -45,6 +45,8 @@ public:
   }
 
 private:
+  ~CheckPermissionsHelper() {}
+
   nsRefPtr<OpenDatabaseHelper> mHelper;
   nsCOMPtr<nsIDOMWindow> mWindow;
   bool mPromptAllowed;

dom/indexedDB/Client.h

@@ -77,6 +77,8 @@ public:
   ShutdownTransactionService() MOZ_OVERRIDE;
 
 private:
+  ~Client() {}
+
   nsresult
   GetDirectory(PersistenceType aPersistenceType, const nsACString& aOrigin,
                nsIFile** aDirectory);

dom/indexedDB/FileInfo.cpp

@@ -14,6 +14,8 @@ namespace {
 
 class CleanupFileRunnable MOZ_FINAL : public nsIRunnable
 {
+  ~CleanupFileRunnable() {}
+
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIRUNNABLE

dom/indexedDB/IDBTransaction.h

@@ -329,7 +329,6 @@ public:
                const nsTArray<nsRefPtr<IDBObjectStore> >& mUpdatedObjectStores);
   CommitHelper(IDBTransaction* aTransaction,
                nsresult aAbortCode);
-  ~CommitHelper();
 
   template<class T>
   bool AddDoomedObject(nsCOMPtr<T>& aCOMPtr)
@@ -345,6 +344,8 @@ public:
   }
 
 private:
+  ~CommitHelper();
+
   // Writes new autoincrement counts to database
   nsresult WriteAutoIncrementCounts();
 
@@ -366,6 +367,9 @@ private:
 
 class UpdateRefcountFunction MOZ_FINAL : public mozIStorageFunction
 {
+  ~UpdateRefcountFunction()
+  { }
+
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_MOZISTORAGEFUNCTION
@@ -374,9 +378,6 @@ public:
   : mFileManager(aFileManager), mInSavepoint(false)
   { }
 
-  ~UpdateRefcountFunction()
-  { }
-
   void StartSavepoint()
   {
     MOZ_ASSERT(!mInSavepoint);

dom/indexedDB/IndexedDatabaseManager.cpp

@@ -121,6 +121,8 @@ public:
   AsyncDeleteFileRunnable(FileManager* aFileManager, int64_t aFileId);
 
 private:
+  ~AsyncDeleteFileRunnable() {}
+
   nsRefPtr<FileManager> mFileManager;
   int64_t mFileId;
 };
@@ -155,6 +157,8 @@ public:
                                   bool* aResult);
 
 private:
+  ~GetFileReferencesHelper() {}
+
   PersistenceType mPersistenceType;
   nsCString mOrigin;
   nsString mDatabaseName;

dom/indexedDB/OpenDatabaseHelper.cpp

@@ -881,6 +881,8 @@ UpgradeSchemaFrom7To8(mozIStorageConnection* aConnection)
 
 class CompressDataBlobsFunction MOZ_FINAL : public mozIStorageFunction
 {
+  ~CompressDataBlobsFunction() {}
+
 public:
   NS_DECL_ISUPPORTS
 
@@ -1142,6 +1144,8 @@ UpgradeSchemaFrom10_0To11_0(mozIStorageConnection* aConnection)
 
 class EncodeKeysFunction MOZ_FINAL : public mozIStorageFunction
 {
+  ~EncodeKeysFunction() {}
+
 public:
   NS_DECL_ISUPPORTS
 

dom/indexedDB/OpenDatabaseHelper.h

@@ -34,6 +34,8 @@ class OpenDatabaseHelper : public HelperBase
   typedef mozilla::dom::quota::PersistenceType PersistenceType;
   typedef mozilla::dom::quota::StoragePrivilege StoragePrivilege;
 
+  ~OpenDatabaseHelper() {}
+
 public:
   OpenDatabaseHelper(IDBOpenDBRequest* aRequest,
                      const nsAString& aName,

dom/indexedDB/TransactionThreadPool.cpp

@@ -58,6 +58,8 @@ public:
                                    nsCOMPtr<nsIRunnable>& aFinishRunnable);
 
 private:
+  ~FinishTransactionRunnable() {}
+
   IDBTransaction* mTransaction;
   nsCOMPtr<nsIRunnable> mFinishRunnable;
 };

dom/indexedDB/TransactionThreadPool.h

@@ -71,6 +71,8 @@ protected:
     void Finish(nsIRunnable* aFinishRunnable);
 
   private:
+    ~TransactionQueue() {}
+
     mozilla::Monitor mMonitor;
     IDBTransaction* mTransaction;
     nsAutoTArray<nsCOMPtr<nsIRunnable>, 10> mQueue;

dom/ipc/ColorPickerParent.h

@@ -22,8 +22,6 @@ class ColorPickerParent : public PColorPickerParent
   , mInitialColor(aInitialColor)
   {}
 
-  virtual ~ColorPickerParent() {}
-
   virtual bool RecvOpen() MOZ_OVERRIDE;
   virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
 
@@ -41,10 +39,13 @@ class ColorPickerParent : public PColorPickerParent
     void Destroy();
 
   private:
+    ~ColorPickerShownCallback() {}
     ColorPickerParent* mColorPickerParent;
   };
 
  private:
+  virtual ~ColorPickerParent() {}
+
   bool CreateColorPicker();
 
   nsRefPtr<ColorPickerShownCallback> mCallback;

dom/ipc/ContentBridgeChild.h

@@ -21,8 +21,6 @@ public:
 
   NS_DECL_ISUPPORTS
 
-  virtual ~ContentBridgeChild();
-
   static ContentBridgeChild*
   Create(Transport* aTransport, ProcessId aOtherProcess);
 
@@ -48,6 +46,8 @@ public:
                                        const bool& aIsForBrowser) MOZ_OVERRIDE;
 
 protected:
+  virtual ~ContentBridgeChild();
+
   virtual PBrowserChild* AllocPBrowserChild(const IPCTabContext& aContext,
                                             const uint32_t& aChromeFlags,
                                             const uint64_t& aID,

dom/ipc/ContentBridgeParent.h

@@ -21,8 +21,6 @@ public:
 
   NS_DECL_ISUPPORTS
 
-  virtual ~ContentBridgeParent();
-
   virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
   void DeferredDestroy();
 
@@ -57,6 +55,8 @@ public:
   }
 
 protected:
+  virtual ~ContentBridgeParent();
+
   void SetChildID(uint64_t aId)
   {
     mChildID = aId;

dom/ipc/ContentChild.cpp

@@ -192,9 +192,10 @@ public:
 
     MemoryReportRequestChild(uint32_t aGeneration, bool aAnonymize,
                              const nsAString& aDMDDumpIdent);
-    virtual ~MemoryReportRequestChild();
     NS_IMETHOD Run();
 private:
+    virtual ~MemoryReportRequestChild();
+
     uint32_t mGeneration;
     bool     mAnonymize;
     nsString mDMDDumpIdent;
@@ -362,6 +363,8 @@ public:
     NS_DECL_NSICONSOLELISTENER
 
 private:
+    ~ConsoleListener() {}
+
     ContentChild* mChild;
     friend class ContentChild;
 };
@@ -418,6 +421,8 @@ ConsoleListener::Observe(nsIConsoleMessage* aMessage)
 
 class SystemMessageHandledObserver MOZ_FINAL : public nsIObserver
 {
+    ~SystemMessageHandledObserver() {}
+
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIOBSERVER
@@ -697,6 +702,7 @@ ContentChild::AllocPMemoryReportRequestChild(const uint32_t& aGeneration,
 // This is just a wrapper for InfallibleTArray<MemoryReport> that implements
 // nsISupports, so it can be passed to nsIMemoryReporter::CollectReports.
 class MemoryReportsWrapper MOZ_FINAL : public nsISupports {
+    ~MemoryReportsWrapper() {}
 public:
     NS_DECL_ISUPPORTS
     MemoryReportsWrapper(InfallibleTArray<MemoryReport> *r) : mReports(r) { }
@@ -728,6 +734,8 @@ public:
         return NS_OK;
     }
 private:
+    ~MemoryReportCallback() {}
+
     const nsCString mProcess;
 };
 NS_IMPL_ISUPPORTS(

dom/ipc/ContentParent.cpp

@@ -445,6 +445,7 @@ private:
 // A memory reporter for ContentParent objects themselves.
 class ContentParentsMemoryReporter MOZ_FINAL : public nsIMemoryReporter
 {
+    ~ContentParentsMemoryReporter() {}
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIMEMORYREPORTER
@@ -1135,6 +1136,8 @@ public:
     }
 
 private:
+    ~SystemMessageHandledListener() {}
+
     static StaticAutoPtr<LinkedList<SystemMessageHandledListener> > sListeners;
 
     void ShutDown()

dom/ipc/ContentParent.h

@@ -686,8 +686,8 @@ public:
   ParentIdleListener(mozilla::dom::ContentParent* aParent, uint64_t aObserver)
     : mParent(aParent), mObserver(aObserver)
   {}
-  virtual ~ParentIdleListener() {}
 private:
+  virtual ~ParentIdleListener() {}
   nsRefPtr<mozilla::dom::ContentParent> mParent;
   uint64_t mObserver;
 };

dom/ipc/FilePickerParent.h

@@ -46,7 +46,6 @@ class FilePickerParent : public PFilePickerParent
     FilePickerShownCallback(FilePickerParent* aFilePickerParent)
       : mFilePickerParent(aFilePickerParent)
     { }
-    virtual ~FilePickerShownCallback() {}
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSIFILEPICKERSHOWNCALLBACK
@@ -54,6 +53,7 @@ class FilePickerParent : public PFilePickerParent
     void Destroy();
 
   private:
+    virtual ~FilePickerShownCallback() {}
     FilePickerParent* mFilePickerParent;
   };
 

dom/ipc/PreallocatedProcessManager.cpp

@@ -80,6 +80,7 @@ private:
   static mozilla::StaticRefPtr<PreallocatedProcessManagerImpl> sSingleton;
 
   PreallocatedProcessManagerImpl();
+  ~PreallocatedProcessManagerImpl() {}
   DISALLOW_EVIL_CONSTRUCTORS(PreallocatedProcessManagerImpl);
 
   void Init();

dom/ipc/ProcessPriorityManager.cpp

@@ -230,9 +230,9 @@ class ParticularProcessPriorityManager MOZ_FINAL
   , public nsITimerCallback
   , public nsSupportsWeakReference
 {
+  ~ParticularProcessPriorityManager();
 public:
   ParticularProcessPriorityManager(ContentParent* aContentParent);
-  ~ParticularProcessPriorityManager();
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBSERVER

dom/ipc/TabChild.h

@@ -148,6 +148,7 @@ public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMEVENTLISTENER
 protected:
+  ~ContentListener() {}
   TabChild* mTabChild;
 };
 
@@ -184,6 +185,7 @@ public:
                                                 nsIWidget* aWidget);
 
 protected:
+    ~TabChildBase() {}
     CSSSize GetPageSize(nsCOMPtr<nsIDocument> aDocument, const CSSSize& aViewport);
 
     // Get the DOMWindowUtils for the top-level window in this tab.

dom/ipc/TabParent.cpp

@@ -2232,6 +2232,8 @@ public:
 #undef NO_IMPL
 
 protected:
+  ~FakeChannel() {}
+
   nsCOMPtr<nsIURI> mUri;
   uint64_t mCallbackId;
   nsCOMPtr<Element> mElement;

dom/ipc/TabParent.h

@@ -57,12 +57,13 @@ class TabParent : public PBrowserParent
     typedef mozilla::dom::ClonedMessageData ClonedMessageData;
     typedef mozilla::layout::ScrollingBehavior ScrollingBehavior;
 
+    virtual ~TabParent();
+
 public:
     // nsITabParent
     NS_DECL_NSITABPARENT
 
     TabParent(nsIContentParent* aManager, const TabContext& aContext, uint32_t aChromeFlags);
-    virtual ~TabParent();
     Element* GetOwnerElement() const { return mFrameElement; }
     void SetOwnerElement(Element* aElement);
 

dom/media/GetUserMediaRequest.h

@@ -24,7 +24,6 @@ public:
                       const nsAString& aCallID,
                       const MediaStreamConstraints& aConstraints,
                       bool aIsSecure);
-  virtual ~GetUserMediaRequest() {};
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(GetUserMediaRequest)
@@ -40,6 +39,8 @@ public:
   void GetConstraints(MediaStreamConstraints &result);
 
 private:
+  virtual ~GetUserMediaRequest() {}
+
   uint64_t mInnerWindowID, mOuterWindowID;
   const nsString mCallID;
   nsAutoPtr<MediaStreamConstraints> mConstraints;

dom/media/MediaManager.h

@@ -444,8 +444,8 @@ public:
   static MediaDevice* Create(MediaEngineVideoSource* source);
   static MediaDevice* Create(MediaEngineAudioSource* source);
 
-  virtual ~MediaDevice() {}
 protected:
+  virtual ~MediaDevice() {}
   MediaDevice(MediaEngineSource* aSource);
   nsString mName;
   nsString mID;

dom/mobilemessage/src/MmsMessage.h

@@ -82,6 +82,8 @@ public:
 
 private:
 
+  ~MmsMessage() {}
+
   int32_t mId;
   uint64_t mThreadId;
   nsString mIccId;

dom/mobilemessage/src/MobileMessageService.h

@@ -22,6 +22,8 @@ public:
   static already_AddRefed<MobileMessageService> GetInstance();
 
 private:
+  ~MobileMessageService() {}
+
   static StaticRefPtr<MobileMessageService> sSingleton;
 
 };

dom/mobilemessage/src/MobileMessageThread.h

@@ -46,6 +46,8 @@ public:
   const ThreadData& GetData() const { return mData; }
 
 private:
+  ~MobileMessageThread() {}
+
   // Don't try to use the default constructor.
   MobileMessageThread() MOZ_DELETE;
 

dom/mobilemessage/src/SmsFilter.h

@@ -27,6 +27,8 @@ public:
   static nsresult NewSmsFilter(nsISupports** aSmsFilter);
 
 private:
+  ~SmsFilter() {}
+
   mobilemessage::SmsFilterData mData;
 };
 

dom/mobilemessage/src/SmsMessage.h

@@ -55,6 +55,8 @@ public:
   const mobilemessage::SmsMessageData& GetData() const;
 
 private:
+  ~SmsMessage() {}
+
   // Don't try to use the default constructor.
   SmsMessage();
 

dom/mobilemessage/src/SmsSegmentInfo.h

@@ -28,6 +28,8 @@ public:
   const mobilemessage::SmsSegmentInfoData& GetData() const;
 
 private:
+  ~SmsSegmentInfo() {}
+
   mobilemessage::SmsSegmentInfoData mData;
 };
 

dom/mobilemessage/src/ipc/SmsIPCService.h

@@ -33,6 +33,8 @@ public:
   SmsIPCService();
 
 private:
+  ~SmsIPCService() {}
+
   uint32_t mMmsDefaultServiceId;
   uint32_t mSmsDefaultServiceId;
 };

dom/network/src/TCPServerSocketParent.h

@@ -35,6 +35,8 @@ public:
   void ReleaseIPDLReference();
 
 private:
+  ~TCPServerSocketParent() {}
+
   virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
 
   PNeckoParent* mNeckoParent;

dom/network/src/UDPSocketParent.h

@@ -26,8 +26,6 @@ public:
     mIPCOpen(true),
     mFilter(filter) {}
 
-  virtual ~UDPSocketParent();
-
   bool Init(const nsCString& aHost, const uint16_t aPort);
 
   virtual bool RecvClose() MOZ_OVERRIDE;
@@ -39,6 +37,8 @@ public:
   virtual bool RecvRequestDelete() MOZ_OVERRIDE;
 
 private:
+  virtual ~UDPSocketParent();
+
   virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
 
   bool mIPCOpen;

dom/plugins/base/nsNPAPIPlugin.h

@@ -32,7 +32,6 @@ private:
 
 public:
   nsNPAPIPlugin();
-  virtual ~nsNPAPIPlugin();
 
   NS_DECL_ISUPPORTS
 
@@ -62,6 +61,8 @@ public:
   static nsresult RetainStream(NPStream *pstream, nsISupports **aRetainedPeer);
 
 protected:
+  virtual ~nsNPAPIPlugin();
+
   NPPluginFuncs mPluginFuncs;
   PluginLibrary* mLibrary;
 };