Bug 1613985 - Use MOZ_COUNTED_DEFAULT_CTOR_*/MOZ_COUNTED_DTOR_* macros. r=froydnj

This removes the need for explicit #ifdef NS_BUILD_REFCNT_LOGGING without
introducing user-defined destructors when it is not defined.

Also, some uses of virtual for declaring destructors are replaced by the
appropriate override declaration through these changes.

Differential Revision: https://phabricator.services.mozilla.com/D62604

--HG--
extra : moz-landing-system : lando

accessible/base/AccGroupInfo.h

@@ -15,7 +15,7 @@ namespace a11y {
  */
 class AccGroupInfo {
  public:
-  ~AccGroupInfo() { MOZ_COUNT_DTOR(AccGroupInfo); }
+  MOZ_COUNTED_DTOR(AccGroupInfo)
 
   /**
    * Return 1-based position in the group.

accessible/generic/DocAccessible.cpp

@@ -1828,7 +1828,7 @@ class InsertIterator final {
     MOZ_ASSERT(aNodes, "No nodes to search for accessible elements");
     MOZ_COUNT_CTOR(InsertIterator);
   }
-  ~InsertIterator() { MOZ_COUNT_DTOR(InsertIterator); }
+  MOZ_COUNTED_DTOR(InsertIterator)
 
   Accessible* Context() const { return mWalker.Context(); }
   Accessible* Child() const { return mChild; }

accessible/ipc/other/ProxyAccessible.h

@@ -29,7 +29,7 @@ class ProxyAccessible : public ProxyAccessibleBase<ProxyAccessible> {
     MOZ_COUNT_CTOR(ProxyAccessible);
   }
 
-  ~ProxyAccessible() { MOZ_COUNT_DTOR(ProxyAccessible); }
+  MOZ_COUNTED_DTOR(ProxyAccessible)
 
 #include "mozilla/a11y/ProxyAccessibleShared.h"
 

accessible/ipc/win/ProxyAccessible.h

@@ -28,7 +28,7 @@ class ProxyAccessible : public ProxyAccessibleBase<ProxyAccessible> {
     MOZ_COUNT_CTOR(ProxyAccessible);
   }
 
-  ~ProxyAccessible() { MOZ_COUNT_DTOR(ProxyAccessible); }
+  MOZ_COUNTED_DTOR(ProxyAccessible)
 
 #include "mozilla/a11y/ProxyAccessibleShared.h"
 

dom/base/ChildIterator.h

@@ -303,7 +303,7 @@ class MOZ_NEEDS_MEMMOVABLE_MEMBERS StyleChildrenIterator
     return *this;
   }
 
-  ~StyleChildrenIterator() { MOZ_COUNT_DTOR(StyleChildrenIterator); }
+  MOZ_COUNTED_DTOR(StyleChildrenIterator)
 
   using AllChildrenIterator::GetNextChild;
   using AllChildrenIterator::GetPreviousChild;

dom/base/DirectionalityUtils.cpp

@@ -508,9 +508,7 @@ class nsTextNodeDirectionalityMap {
     aTextNode->SetHasTextNodeDirectionalityMap();
   }
 
-  ~nsTextNodeDirectionalityMap() {
-    MOZ_COUNT_DTOR(nsTextNodeDirectionalityMap);
-  }
+  MOZ_COUNTED_DTOR(nsTextNodeDirectionalityMap)
 
   static void nsTextNodeDirectionalityMapPropertyDestructor(
       void* aObject, nsAtom* aProperty, void* aPropertyValue, void* aData) {

dom/base/Document.cpp

@@ -12804,8 +12804,8 @@ class FullscreenRoots {
   static bool IsEmpty();
 
  private:
-  FullscreenRoots() { MOZ_COUNT_CTOR(FullscreenRoots); }
-  ~FullscreenRoots() { MOZ_COUNT_DTOR(FullscreenRoots); }
+  MOZ_COUNTED_DEFAULT_CTOR(FullscreenRoots)
+  MOZ_COUNTED_DTOR(FullscreenRoots)
 
   enum { NotFound = uint32_t(-1) };
   // Looks in mRoots for aRoot. Returns the index if found, otherwise NotFound.

dom/base/Document.h

@@ -1599,7 +1599,7 @@ class Document : public nsINode,
 
     nsExpirationState* GetExpirationState() { return &mState; }
 
-    ~SelectorCacheKey() { MOZ_COUNT_DTOR(SelectorCacheKey); }
+    MOZ_COUNTED_DTOR(SelectorCacheKey)
   };
 
   class SelectorCacheKeyDeleter;

dom/base/FullscreenChange.h

@@ -89,7 +89,7 @@ class FullscreenRequest : public FullscreenChange {
                                             dom::CallerType::NonSystem, false));
   }
 
-  ~FullscreenRequest() { MOZ_COUNT_DTOR(FullscreenRequest); }
+  MOZ_COUNTED_DTOR(FullscreenRequest)
 
   dom::Element* Element() const { return mElement; }
 
@@ -149,7 +149,7 @@ class FullscreenExit : public FullscreenChange {
     return WrapUnique(new FullscreenExit(aDoc, nullptr));
   }
 
-  ~FullscreenExit() { MOZ_COUNT_DTOR(FullscreenExit); }
+  MOZ_COUNTED_DTOR(FullscreenExit)
 
  private:
   FullscreenExit(dom::Document* aDoc, already_AddRefed<Promise> aPromise)

dom/base/nsContentUtils.cpp

@@ -8286,7 +8286,7 @@ class StringBuilder {
  public:
   StringBuilder() : mLast(this), mLength(0) { MOZ_COUNT_CTOR(StringBuilder); }
 
-  ~StringBuilder() { MOZ_COUNT_DTOR(StringBuilder); }
+  MOZ_COUNTED_DTOR(StringBuilder)
 
   void Append(nsAtom* aAtom) {
     Unit* u = AddUnit();

dom/base/nsFrameMessageManager.h

@@ -402,9 +402,7 @@ struct nsMessageManagerScriptHolder {
     MOZ_COUNT_CTOR(nsMessageManagerScriptHolder);
   }
 
-  ~nsMessageManagerScriptHolder() {
-    MOZ_COUNT_DTOR(nsMessageManagerScriptHolder);
-  }
+  MOZ_COUNTED_DTOR(nsMessageManagerScriptHolder)
 
   JS::PersistentRooted<JSScript*> mScript;
 };
@@ -421,9 +419,7 @@ class nsMessageManagerScriptExecutor {
   nsMessageManagerScriptExecutor() {
     MOZ_COUNT_CTOR(nsMessageManagerScriptExecutor);
   }
-  ~nsMessageManagerScriptExecutor() {
-    MOZ_COUNT_DTOR(nsMessageManagerScriptExecutor);
-  }
+  MOZ_COUNTED_DTOR(nsMessageManagerScriptExecutor)
 
   void DidCreateScriptLoader();
   void LoadScriptInternal(JS::Handle<JSObject*> aMessageManager,

dom/bindings/NonRefcountedDOMObject.h

@@ -20,9 +20,9 @@ namespace dom {
 // the leak log too.
 class NonRefcountedDOMObject {
  protected:
-  NonRefcountedDOMObject() { MOZ_COUNT_CTOR(NonRefcountedDOMObject); }
+  MOZ_COUNTED_DEFAULT_CTOR(NonRefcountedDOMObject)
 
-  ~NonRefcountedDOMObject() { MOZ_COUNT_DTOR(NonRefcountedDOMObject); }
+  MOZ_COUNTED_DTOR(NonRefcountedDOMObject)
 
   NonRefcountedDOMObject(const NonRefcountedDOMObject& aOther)
       : NonRefcountedDOMObject() {}

dom/canvas/TextMetrics.h

@@ -37,7 +37,7 @@ class TextMetrics final : public NonRefcountedDOMObject {
     MOZ_COUNT_CTOR(TextMetrics);
   }
 
-  ~TextMetrics() { MOZ_COUNT_DTOR(TextMetrics); }
+  MOZ_COUNTED_DTOR(TextMetrics)
 
   double Width() const { return width; }
 

dom/encoding/TextDecoder.h

@@ -40,7 +40,7 @@ class TextDecoder final : public NonRefcountedDOMObject {
     MOZ_COUNT_CTOR(TextDecoder);
   }
 
-  ~TextDecoder() { MOZ_COUNT_DTOR(TextDecoder); }
+  MOZ_COUNTED_DTOR(TextDecoder)
 
   bool WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto,
                   JS::MutableHandle<JSObject*> aReflector) {

dom/events/EventDispatcher.cpp

@@ -135,7 +135,7 @@ class EventTargetChainItem {
     MOZ_COUNT_CTOR(EventTargetChainItem);
   }
 
-  ~EventTargetChainItem() { MOZ_COUNT_DTOR(EventTargetChainItem); }
+  MOZ_COUNTED_DTOR(EventTargetChainItem)
 
   static EventTargetChainItem* Create(nsTArray<EventTargetChainItem>& aChain,
                                       EventTarget* aTarget,

dom/events/PointerEventHandler.h

@@ -28,7 +28,7 @@ class PointerCaptureInfo final {
     MOZ_COUNT_CTOR(PointerCaptureInfo);
   }
 
-  ~PointerCaptureInfo() { MOZ_COUNT_DTOR(PointerCaptureInfo); }
+  MOZ_COUNTED_DTOR(PointerCaptureInfo)
 
   bool Empty() { return !(mPendingContent || mOverrideContent); }
 };

dom/html/HTMLFormSubmission.h

@@ -45,7 +45,7 @@ class HTMLFormSubmission {
                               NotNull<const Encoding*>& aEncoding,
                               HTMLFormSubmission** aFormSubmission);
 
-  virtual ~HTMLFormSubmission() { MOZ_COUNT_DTOR(HTMLFormSubmission); }
+  MOZ_COUNTED_DTOR_VIRTUAL(HTMLFormSubmission)
 
   /**
    * Submit a name/value pair

dom/indexedDB/ActorsParent.cpp

@@ -532,7 +532,7 @@ struct IndexDataValue final {
     MOZ_COUNT_CTOR(IndexDataValue);
   }
 
-  ~IndexDataValue() { MOZ_COUNT_DTOR(IndexDataValue); }
+  MOZ_COUNTED_DTOR(IndexDataValue)
 
   bool operator==(const IndexDataValue& aOther) const {
     if (mIndexId != aOther.mIndexId) {

dom/indexedDB/IDBObjectStore.cpp

@@ -114,7 +114,7 @@ struct IDBObjectStore::StructuredCloneWriteInfo {
     aCloneWriteInfo.mOffsetToKeyProp = 0;
   }
 
-  ~StructuredCloneWriteInfo() { MOZ_COUNT_DTOR(StructuredCloneWriteInfo); }
+  MOZ_COUNTED_DTOR(StructuredCloneWriteInfo)
 };
 
 // Used by ValueWrapper::Clone to hold strong references to any blob-like
@@ -135,9 +135,9 @@ struct MOZ_STACK_CLASS MutableFileData final {
   nsString type;
   nsString name;
 
-  MutableFileData() { MOZ_COUNT_CTOR(MutableFileData); }
+  MOZ_COUNTED_DEFAULT_CTOR(MutableFileData)
 
-  ~MutableFileData() { MOZ_COUNT_DTOR(MutableFileData); }
+  MOZ_COUNTED_DTOR(MutableFileData)
 };
 
 struct MOZ_STACK_CLASS BlobOrFileData final {
@@ -151,7 +151,7 @@ struct MOZ_STACK_CLASS BlobOrFileData final {
     MOZ_COUNT_CTOR(BlobOrFileData);
   }
 
-  ~BlobOrFileData() { MOZ_COUNT_DTOR(BlobOrFileData); }
+  MOZ_COUNTED_DTOR(BlobOrFileData)
 };
 
 struct MOZ_STACK_CLASS WasmModuleData final {
@@ -164,7 +164,7 @@ struct MOZ_STACK_CLASS WasmModuleData final {
     MOZ_COUNT_CTOR(WasmModuleData);
   }
 
-  ~WasmModuleData() { MOZ_COUNT_DTOR(WasmModuleData); }
+  MOZ_COUNTED_DTOR(WasmModuleData)
 };
 
 struct MOZ_STACK_CLASS GetAddInfoClosure final {
@@ -177,7 +177,7 @@ struct MOZ_STACK_CLASS GetAddInfoClosure final {
     MOZ_COUNT_CTOR(GetAddInfoClosure);
   }
 
-  ~GetAddInfoClosure() { MOZ_COUNT_DTOR(GetAddInfoClosure); }
+  MOZ_COUNTED_DTOR(GetAddInfoClosure)
 };
 
 RefPtr<IDBRequest> GenerateRequest(JSContext* aCx,

dom/indexedDB/IDBObjectStore.h

@@ -88,7 +88,7 @@ class IDBObjectStore final : public nsISupports, public nsWrapperCache {
       MOZ_COUNT_CTOR(IDBObjectStore::ValueWrapper);
     }
 
-    ~ValueWrapper() { MOZ_COUNT_DTOR(IDBObjectStore::ValueWrapper); }
+    MOZ_COUNTED_DTOR_NESTED(ValueWrapper, IDBObjectStore::ValueWrapper)
 
     const JS::Rooted<JS::Value>& Value() const { return mValue; }
 

dom/indexedDB/KeyPath.h

@@ -42,7 +42,7 @@ class KeyPath {
     *this = aOther;
   }
 
-  ~KeyPath() { MOZ_COUNT_DTOR(KeyPath); }
+  MOZ_COUNTED_DTOR(KeyPath)
 
   static nsresult Parse(const nsAString& aString, KeyPath* aKeyPath);
 

dom/ipc/ContentParent.cpp

@@ -356,7 +356,7 @@ namespace dom {
 // IPC receiver for remote GC/CC logging.
 class CycleCollectWithLogsParent final : public PCycleCollectWithLogsParent {
  public:
-  ~CycleCollectWithLogsParent() { MOZ_COUNT_DTOR(CycleCollectWithLogsParent); }
+  MOZ_COUNTED_DTOR(CycleCollectWithLogsParent)
 
   static bool AllocAndSendConstructor(ContentParent* aManager,
                                       bool aDumpAllTraces,

dom/ipc/ContentProcessManager.h

@@ -20,7 +20,7 @@ class ContentParent;
 class ContentProcessManager final {
  public:
   static ContentProcessManager* GetSingleton();
-  ~ContentProcessManager() { MOZ_COUNT_DTOR(ContentProcessManager); };
+  MOZ_COUNTED_DTOR(ContentProcessManager);
 
   /**
    * Add a new content process into the map.
@@ -83,7 +83,7 @@ class ContentProcessManager final {
   nsDataHashtable<nsUint64HashKey, ContentParent*> mContentParentMap;
   nsDataHashtable<nsUint64HashKey, BrowserParent*> mBrowserParentMap;
 
-  ContentProcessManager() { MOZ_COUNT_CTOR(ContentProcessManager); };
+  MOZ_COUNTED_DEFAULT_CTOR(ContentProcessManager);
 };
 
 }  // namespace dom

dom/media/MediaFormatReader.cpp

@@ -453,7 +453,7 @@ class MediaFormatReader::DemuxerProxy {
     MOZ_COUNT_CTOR(DemuxerProxy);
   }
 
-  ~DemuxerProxy() { MOZ_COUNT_DTOR(DemuxerProxy); }
+  MOZ_COUNTED_DTOR(DemuxerProxy)
 
   RefPtr<ShutdownPromise> Shutdown() {
     RefPtr<Data> data = std::move(mData);

dom/media/MediaInfo.h

@@ -102,7 +102,7 @@ class TrackInfo {
 
   virtual UniquePtr<TrackInfo> Clone() const = 0;
 
-  virtual ~TrackInfo() { MOZ_COUNT_DTOR(TrackInfo); }
+  MOZ_COUNTED_DTOR_VIRTUAL(TrackInfo)
 
  protected:
   TrackInfo(const TrackInfo& aOther) {

dom/media/MediaSegment.h

@@ -99,7 +99,7 @@ class MediaSegment {
   MediaSegment(const MediaSegment&) = delete;
   MediaSegment& operator=(const MediaSegment&) = delete;
 
-  virtual ~MediaSegment() { MOZ_COUNT_DTOR(MediaSegment); }
+  MOZ_COUNTED_DTOR_VIRTUAL(MediaSegment)
 
   enum Type { AUDIO, VIDEO, TYPE_COUNT };
 

dom/media/MediaTrackGraph.h

@@ -788,7 +788,7 @@ class MediaInputPort final {
   }
 
   // Private destructor, to discourage deletion outside of Release():
-  ~MediaInputPort() { MOZ_COUNT_DTOR(MediaInputPort); }
+  MOZ_COUNTED_DTOR(MediaInputPort)
 
  public:
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaInputPort)
@@ -1134,7 +1134,7 @@ class MediaTrackGraph {
   explicit MediaTrackGraph(TrackRate aSampleRate) : mSampleRate(aSampleRate) {
     MOZ_COUNT_CTOR(MediaTrackGraph);
   }
-  virtual ~MediaTrackGraph() { MOZ_COUNT_DTOR(MediaTrackGraph); }
+  MOZ_COUNTED_DTOR_VIRTUAL(MediaTrackGraph)
 
   // Intended only for assertions, either on graph thread or not running (in
   // which case we must be on the main thread).

dom/media/MediaTrackGraphImpl.h

@@ -55,7 +55,7 @@ class ControlMessage {
     MOZ_COUNT_CTOR(ControlMessage);
   }
   // All these run on the graph thread
-  virtual ~ControlMessage() { MOZ_COUNT_DTOR(ControlMessage); }
+  MOZ_COUNTED_DTOR_VIRTUAL(ControlMessage)
   // Do the action of this message on the MediaTrackGraph thread. Any actions
   // affecting graph processing should take effect at mProcessedTime.
   // All track data for times < mProcessedTime has already been

dom/media/VideoFrameConverter.h

@@ -214,7 +214,7 @@ class VideoFrameConverter {
     }
   };
 
-  virtual ~VideoFrameConverter() { MOZ_COUNT_DTOR(VideoFrameConverter); }
+  MOZ_COUNTED_DTOR_VIRTUAL(VideoFrameConverter)
 
   static void SameFrameTick(nsITimer* aTimer, void* aClosure) {
     MOZ_ASSERT(aClosure);

dom/media/gmp/GMPTimerParent.h

@@ -37,7 +37,7 @@ class GMPTimerParent : public PGMPTimerParent {
 
   struct Context {
     Context() : mId(0) { MOZ_COUNT_CTOR(Context); }
-    ~Context() { MOZ_COUNT_DTOR(Context); }
+    MOZ_COUNTED_DTOR(Context)
     nsCOMPtr<nsITimer> mTimer;
     RefPtr<GMPTimerParent>
         mParent;  // Note: live timers keep the GMPTimerParent alive.

dom/media/gmp/mozIGeckoMediaPluginService.idl

@@ -41,8 +41,8 @@ typedef GMPVideoGetterCallback<GMPVideoEncoderProxy> GetGMPVideoEncoderCallback;
 class GetNodeIdCallback
 {
 public:
-  GetNodeIdCallback() { MOZ_COUNT_CTOR(GetNodeIdCallback); }
-  virtual ~GetNodeIdCallback() { MOZ_COUNT_DTOR(GetNodeIdCallback); }
+  MOZ_COUNTED_DEFAULT_CTOR(GetNodeIdCallback)
+  MOZ_COUNTED_DTOR_VIRTUAL(GetNodeIdCallback)
   virtual void Done(nsresult aResult, const nsACString& aNodeId) = 0;
 };
 %}

dom/media/ogg/OggCodecState.h

@@ -546,7 +546,7 @@ class SkeletonState : public OggCodecState {
       MOZ_COUNT_CTOR(nsKeyFrameIndex);
     }
 
-    ~nsKeyFrameIndex() { MOZ_COUNT_DTOR(nsKeyFrameIndex); }
+    MOZ_COUNTED_DTOR(nsKeyFrameIndex)
 
     void Add(int64_t aOffset, int64_t aTimeMs) {
       mKeyPoints.AppendElement(nsKeyPoint(aOffset, aTimeMs));

dom/media/webm/WebMBufferedParser.h

@@ -295,7 +295,7 @@ class WebMBufferedState final {
 
  private:
   // Private destructor, to discourage deletion outside of Release():
-  ~WebMBufferedState() { MOZ_COUNT_DTOR(WebMBufferedState); }
+  MOZ_COUNTED_DTOR(WebMBufferedState)
 
   // Synchronizes access to the mTimeMapping array and mLastBlockOffset.
   ReentrantMonitor mReentrantMonitor;

dom/media/webrtc/MediaEngineDefault.cpp

@@ -364,7 +364,7 @@ class AudioSourcePullListener : public MediaTrackListener {
     MOZ_COUNT_CTOR(AudioSourcePullListener);
   }
 
-  ~AudioSourcePullListener() { MOZ_COUNT_DTOR(AudioSourcePullListener); }
+  MOZ_COUNTED_DTOR(AudioSourcePullListener)
 
   void NotifyPull(MediaTrackGraph* aGraph, TrackTime aEndOfAppendedData,
                   TrackTime aDesiredTime) override;

dom/messagechannel/MessagePortService.cpp

@@ -61,7 +61,7 @@ class MessagePortService::MessagePortServiceData final {
   MessagePortServiceData(const MessagePortServiceData& aOther) = delete;
   MessagePortServiceData& operator=(const MessagePortServiceData&) = delete;
 
-  ~MessagePortServiceData() { MOZ_COUNT_DTOR(MessagePortServiceData); }
+  MOZ_COUNTED_DTOR(MessagePortServiceData)
 
   nsID mDestinationUUID;
 

dom/plugins/base/nsPluginNativeWindow.h

@@ -20,7 +20,7 @@ class nsPluginNativeWindow : public NPWindow {
  public:
   nsPluginNativeWindow() : NPWindow() { MOZ_COUNT_CTOR(nsPluginNativeWindow); }
 
-  virtual ~nsPluginNativeWindow() { MOZ_COUNT_DTOR(nsPluginNativeWindow); }
+  MOZ_COUNTED_DTOR_VIRTUAL(nsPluginNativeWindow)
 
   /**
    *   !!! CAUTION !!!

dom/plugins/ipc/PluginScriptableObjectChild.h

@@ -25,7 +25,7 @@ struct ChildNPObject : NPObject {
     MOZ_COUNT_CTOR(ChildNPObject);
   }
 
-  ~ChildNPObject() { MOZ_COUNT_DTOR(ChildNPObject); }
+  MOZ_COUNTED_DTOR(ChildNPObject)
 
   // |parent| is always valid as long as the actor is alive. Once the actor is
   // destroyed this will be set to null.
@@ -143,7 +143,7 @@ class PluginScriptableObjectChild : public PPluginScriptableObjectChild {
       MOZ_COUNT_CTOR(StoredIdentifier);
     }
 
-    ~StoredIdentifier() { MOZ_COUNT_DTOR(StoredIdentifier); }
+    MOZ_COUNTED_DTOR(StoredIdentifier)
   };
 
  public:

dom/presentation/PresentationServiceBase.h

@@ -48,7 +48,7 @@ class PresentationServiceBase {
    public:
     explicit SessionIdManager() { MOZ_COUNT_CTOR(SessionIdManager); }
 
-    ~SessionIdManager() { MOZ_COUNT_DTOR(SessionIdManager); }
+    MOZ_COUNTED_DTOR(SessionIdManager)
 
     nsresult GetWindowId(const nsAString& aSessionId, uint64_t* aWindowId) {
       MOZ_ASSERT(NS_IsMainThread());
@@ -126,7 +126,7 @@ class PresentationServiceBase {
    public:
     explicit AvailabilityManager() { MOZ_COUNT_CTOR(AvailabilityManager); }
 
-    ~AvailabilityManager() { MOZ_COUNT_DTOR(AvailabilityManager); }
+    MOZ_COUNTED_DTOR(AvailabilityManager)
 
     void AddAvailabilityListener(
         const nsTArray<nsString>& aAvailabilityUrls,

dom/quota/ActorsParent.cpp

@@ -995,7 +995,7 @@ class GroupInfo final {
 
  private:
   // Private destructor, to discourage deletion outside of Release():
-  ~GroupInfo() { MOZ_COUNT_DTOR(GroupInfo); }
+  MOZ_COUNTED_DTOR(GroupInfo)
 
   already_AddRefed<OriginInfo> LockedGetOriginInfo(const nsACString& aOrigin);
 
@@ -1024,9 +1024,9 @@ class GroupInfoPair {
   friend class QuotaObject;
 
  public:
-  GroupInfoPair() { MOZ_COUNT_CTOR(GroupInfoPair); }
+  MOZ_COUNTED_DEFAULT_CTOR(GroupInfoPair)
 
-  ~GroupInfoPair() { MOZ_COUNT_DTOR(GroupInfoPair); }
+  MOZ_COUNTED_DTOR(GroupInfoPair)
 
  private:
   already_AddRefed<GroupInfo> LockedGetGroupInfo(

dom/quota/QuotaObject.h

@@ -52,7 +52,7 @@ class QuotaObject {
     MOZ_COUNT_CTOR(QuotaObject);
   }
 
-  ~QuotaObject() { MOZ_COUNT_DTOR(QuotaObject); }
+  MOZ_COUNTED_DTOR(QuotaObject)
 
   already_AddRefed<QuotaObject> LockedAddRef() {
     AssertCurrentThreadOwnsQuotaMutex();

dom/workers/WorkerLocation.h

@@ -42,7 +42,7 @@ class WorkerLocation final : public nsWrapperCache {
     MOZ_COUNT_CTOR(WorkerLocation);
   }
 
-  ~WorkerLocation() { MOZ_COUNT_DTOR(WorkerLocation); }
+  MOZ_COUNTED_DTOR(WorkerLocation)
 
  public:
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WorkerLocation)

dom/xslt/base/txCore.h

@@ -13,12 +13,12 @@
 
 class txObject {
  public:
-  txObject() { MOZ_COUNT_CTOR(txObject); }
+  MOZ_COUNTED_DEFAULT_CTOR(txObject)
 
   /**
    * Deletes this txObject
    */
-  virtual ~txObject() { MOZ_COUNT_DTOR(txObject); }
+  MOZ_COUNTED_DTOR_VIRTUAL(txObject)
 };
 
 /**

dom/xslt/xpath/txExpr.h

@@ -35,8 +35,8 @@ class txXPathTreeWalker;
  **/
 class Expr {
  public:
-  Expr() { MOZ_COUNT_CTOR(Expr); }
-  virtual ~Expr() { MOZ_COUNT_DTOR(Expr); }
+  MOZ_COUNTED_DEFAULT_CTOR(Expr)
+  MOZ_COUNTED_DTOR_VIRTUAL(Expr)
 
   /**
    * Evaluates this Expr based on the given context node and processor state
@@ -330,8 +330,8 @@ class txCoreFunctionCall : public FunctionCall {
  */
 class txNodeTest {
  public:
-  txNodeTest() { MOZ_COUNT_CTOR(txNodeTest); }
-  virtual ~txNodeTest() { MOZ_COUNT_DTOR(txNodeTest); }
+  MOZ_COUNTED_DEFAULT_CTOR(txNodeTest)
+  MOZ_COUNTED_DTOR_VIRTUAL(txNodeTest)
 
   /*
    * Virtual methods

dom/xslt/xslt/txBufferingHandler.cpp

@@ -23,7 +23,7 @@ class txOutputTransaction {
   explicit txOutputTransaction(txTransactionType aType) : mType(aType) {
     MOZ_COUNT_CTOR(txOutputTransaction);
   }
-  virtual ~txOutputTransaction() { MOZ_COUNT_DTOR(txOutputTransaction); }
+  MOZ_COUNTED_DTOR_VIRTUAL(txOutputTransaction)
   txTransactionType mType;
 };
 

dom/xslt/xslt/txInstructions.h

@@ -21,9 +21,9 @@ class txExecutionState;
 
 class txInstruction : public txObject {
  public:
-  txInstruction() { MOZ_COUNT_CTOR(txInstruction); }
+  MOZ_COUNTED_DEFAULT_CTOR(txInstruction)
 
-  virtual ~txInstruction() { MOZ_COUNT_DTOR(txInstruction); }
+  MOZ_COUNTED_DTOR_OVERRIDE(txInstruction)
 
   virtual nsresult execute(txExecutionState& aEs) = 0;
 

dom/xslt/xslt/txStylesheet.h

@@ -175,8 +175,8 @@ class txStripSpaceTest {
  */
 class txIGlobalParameter {
  public:
-  txIGlobalParameter() { MOZ_COUNT_CTOR(txIGlobalParameter); }
-  virtual ~txIGlobalParameter() { MOZ_COUNT_DTOR(txIGlobalParameter); }
+  MOZ_COUNTED_DEFAULT_CTOR(txIGlobalParameter)
+  MOZ_COUNTED_DTOR_VIRTUAL(txIGlobalParameter)
   virtual nsresult getValue(txAExprResult** aValue) = 0;
 };
 

dom/xslt/xslt/txToplevelItems.h

@@ -17,8 +17,8 @@ class Expr;
 
 class txToplevelItem {
  public:
-  txToplevelItem() { MOZ_COUNT_CTOR(txToplevelItem); }
-  virtual ~txToplevelItem() { MOZ_COUNT_DTOR(txToplevelItem); }
+  MOZ_COUNTED_DEFAULT_CTOR(txToplevelItem)
+  MOZ_COUNTED_DTOR_VIRTUAL(txToplevelItem)
 
   enum type {
     attributeSet,

dom/xslt/xslt/txVariableMap.h

@@ -37,7 +37,7 @@ class txVariableMapBase {
 class txVariableMap : public txVariableMapBase {
  public:
   txVariableMap() : txVariableMapBase() { MOZ_COUNT_CTOR(txVariableMap); }
-  ~txVariableMap() { MOZ_COUNT_DTOR(txVariableMap); }
+  MOZ_COUNTED_DTOR(txVariableMap)
 };
 
 /**

dom/xslt/xslt/txXSLTPatterns.h

@@ -13,8 +13,8 @@
 
 class txPattern {
  public:
-  txPattern() { MOZ_COUNT_CTOR(txPattern); }
-  virtual ~txPattern() { MOZ_COUNT_DTOR(txPattern); }
+  MOZ_COUNTED_DEFAULT_CTOR(txPattern)
+  MOZ_COUNTED_DTOR_VIRTUAL(txPattern)
 
   /*
    * Determines whether this Pattern matches the given node.

editor/libeditor/TypeInState.h

@@ -41,7 +41,7 @@ struct PropItem {
         value(aValue) {
     MOZ_COUNT_CTOR(PropItem);
   }
-  ~PropItem() { MOZ_COUNT_DTOR(PropItem); }
+  MOZ_COUNTED_DTOR(PropItem)
 };
 
 class StyleCache final {

gfx/layers/LayerTreeInvalidation.cpp

@@ -212,7 +212,7 @@ struct LayerPropertiesBase : public LayerProperties {
         mUseClipRect(false) {
     MOZ_COUNT_CTOR(LayerPropertiesBase);
   }
-  virtual ~LayerPropertiesBase() { MOZ_COUNT_DTOR(LayerPropertiesBase); }
+  MOZ_COUNTED_DTOR_OVERRIDE(LayerPropertiesBase)
 
  protected:
   LayerPropertiesBase(const LayerPropertiesBase& a) = delete;

gfx/layers/TextureDIB.cpp

@@ -44,7 +44,7 @@ class MemoryDIBTextureData : public DIBTextureData {
     MOZ_COUNT_CTOR(MemoryDIBTextureData);
   }
 
-  virtual ~MemoryDIBTextureData() { MOZ_COUNT_DTOR(MemoryDIBTextureData); }
+  MOZ_COUNTED_DTOR_OVERRIDE(MemoryDIBTextureData)
 };
 
 /**

gfx/layers/ZoomConstraints.h

@@ -42,7 +42,7 @@ struct ZoomConstraints {
     MOZ_COUNT_CTOR(ZoomConstraints);
   }
 
-  ~ZoomConstraints() { MOZ_COUNT_DTOR(ZoomConstraints); }
+  MOZ_COUNTED_DTOR(ZoomConstraints)
 
   bool operator==(const ZoomConstraints& other) const {
     return mAllowZoom == other.mAllowZoom &&

gfx/layers/basic/BasicColorLayer.cpp

@@ -32,7 +32,7 @@ class BasicColorLayer : public ColorLayer, public BasicImplData {
   }
 
  protected:
-  virtual ~BasicColorLayer() { MOZ_COUNT_DTOR(BasicColorLayer); }
+  MOZ_COUNTED_DTOR_OVERRIDE(BasicColorLayer)
 
  public:
   void SetVisibleRegion(const LayerIntRegion& aRegion) override {

gfx/layers/basic/BasicImageLayer.cpp

@@ -31,7 +31,7 @@ class BasicImageLayer : public ImageLayer, public BasicImplData {
   }
 
  protected:
-  virtual ~BasicImageLayer() { MOZ_COUNT_DTOR(BasicImageLayer); }
+  MOZ_COUNTED_DTOR_OVERRIDE(BasicImageLayer)
 
  public:
   void SetVisibleRegion(const LayerIntRegion& aRegion) override {

gfx/layers/basic/BasicImplData.h

@@ -49,7 +49,7 @@ class BasicImplData {
         mOperator(gfx::CompositionOp::OP_OVER) {
     MOZ_COUNT_CTOR(BasicImplData);
   }
-  virtual ~BasicImplData() { MOZ_COUNT_DTOR(BasicImplData); }
+  MOZ_COUNTED_DTOR_VIRTUAL(BasicImplData)
 
   /**
    * Layers that paint themselves, such as ImageLayers, should paint

gfx/layers/basic/BasicLayersImpl.h

@@ -55,7 +55,7 @@ class BasicReadbackLayer : public ReadbackLayer, public BasicImplData {
   }
 
  protected:
-  virtual ~BasicReadbackLayer() { MOZ_COUNT_DTOR(BasicReadbackLayer); }
+  MOZ_COUNTED_DTOR_OVERRIDE(BasicReadbackLayer)
 
  public:
   void SetVisibleRegion(const LayerIntRegion& aRegion) override {

gfx/layers/basic/BasicPaintedLayer.h

@@ -39,7 +39,7 @@ class BasicPaintedLayer : public PaintedLayer, public BasicImplData {
   }
 
  protected:
-  virtual ~BasicPaintedLayer() { MOZ_COUNT_DTOR(BasicPaintedLayer); }
+  MOZ_COUNTED_DTOR_OVERRIDE(BasicPaintedLayer)
 
  public:
   void SetVisibleRegion(const LayerIntRegion& aRegion) override {

gfx/layers/client/ClientColorLayer.cpp

@@ -26,7 +26,7 @@ class ClientColorLayer : public ColorLayer, public ClientLayer {
   }
 
  protected:
-  virtual ~ClientColorLayer() { MOZ_COUNT_DTOR(ClientColorLayer); }
+  MOZ_COUNTED_DTOR_OVERRIDE(ClientColorLayer)
 
  public:
   void SetVisibleRegion(const LayerIntRegion& aRegion) override {

gfx/layers/client/ClientContainerLayer.h

@@ -137,7 +137,7 @@ class ClientRefLayer : public RefLayer, public ClientLayer {
   }
 
  protected:
-  virtual ~ClientRefLayer() { MOZ_COUNT_DTOR(ClientRefLayer); }
+  MOZ_COUNTED_DTOR_OVERRIDE(ClientRefLayer)
 
  public:
   Layer* AsLayer() override { return this; }

gfx/layers/client/ClientLayerManager.h

@@ -349,7 +349,7 @@ class ClientLayerManager final : public LayerManager,
 
 class ClientLayer : public ShadowableLayer {
  public:
-  ClientLayer() { MOZ_COUNT_CTOR(ClientLayer); }
+  MOZ_COUNTED_DEFAULT_CTOR(ClientLayer)
 
   ~ClientLayer();
 

gfx/layers/client/TextureClient.h

@@ -254,7 +254,7 @@ class TextureData {
 
   static bool IsRemote(LayersBackend aLayersBackend, BackendSelector aSelector);
 
-  virtual ~TextureData() { MOZ_COUNT_DTOR(TextureData); }
+  MOZ_COUNTED_DTOR_VIRTUAL(TextureData)
 
   virtual void FillInfo(TextureData::Info& aInfo) const = 0;
 
@@ -313,7 +313,7 @@ class TextureData {
   virtual GPUVideoTextureData* AsGPUVideoTextureData() { return nullptr; }
 
  protected:
-  TextureData() { MOZ_COUNT_CTOR(TextureData); }
+  MOZ_COUNTED_DEFAULT_CTOR(TextureData)
 };
 
 /**

gfx/src/nsRect.h

@@ -50,9 +50,7 @@ struct nsRect : public mozilla::gfx::BaseRect<nscoord, nsRect, nsPoint, nsSize,
   }
   nsRect& operator=(const nsRect&) = default;
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsRect() { MOZ_COUNT_DTOR(nsRect); }
-#endif
+  MOZ_COUNTED_DTOR(nsRect)
 
   // We have saturating versions of all the Union methods. These avoid
   // overflowing nscoord values in the 'width' and 'height' fields by

gfx/thebes/gfxFontInfoLoader.h

@@ -56,7 +56,7 @@ class FontInfoData {
 
  protected:
   // Protected destructor, to discourage deletion outside of Release():
-  virtual ~FontInfoData() { MOZ_COUNT_DTOR(FontInfoData); }
+  MOZ_COUNTED_DTOR_VIRTUAL(FontInfoData)
 
  public:
   virtual void Load();

gfx/thebes/gfxPlatformFontList.h

@@ -45,7 +45,7 @@ class CharMapHashKey : public PLDHashEntryHdr {
   CharMapHashKey(const CharMapHashKey& toCopy) : mCharMap(toCopy.mCharMap) {
     MOZ_COUNT_CTOR(CharMapHashKey);
   }
-  ~CharMapHashKey() { MOZ_COUNT_DTOR(CharMapHashKey); }
+  MOZ_COUNTED_DTOR(CharMapHashKey)
 
   gfxCharacterMap* GetKey() const { return mCharMap; }
 

gfx/webrender_bindings/WebRenderAPI.cpp

@@ -53,7 +53,7 @@ class NewRenderer : public RendererEvent {
     MOZ_COUNT_CTOR(NewRenderer);
   }
 
-  ~NewRenderer() { MOZ_COUNT_DTOR(NewRenderer); }
+  MOZ_COUNTED_DTOR(NewRenderer)
 
   void Run(RenderThread& aRenderThread, WindowId aWindowId) override {
     layers::AutoCompleteTask complete(mTask);
@@ -158,7 +158,7 @@ class RemoveRenderer : public RendererEvent {
     MOZ_COUNT_CTOR(RemoveRenderer);
   }
 
-  virtual ~RemoveRenderer() { MOZ_COUNT_DTOR(RemoveRenderer); }
+  MOZ_COUNTED_DTOR_OVERRIDE(RemoveRenderer)
 
   void Run(RenderThread& aRenderThread, WindowId aWindowId) override {
     aRenderThread.RemoveRenderer(aWindowId);
@@ -486,7 +486,7 @@ void WebRenderAPI::Readback(const TimeStamp& aStartTime, gfx::IntSize size,
       MOZ_COUNT_CTOR(Readback);
     }
 
-    virtual ~Readback() { MOZ_COUNT_DTOR(Readback); }
+    MOZ_COUNTED_DTOR_OVERRIDE(Readback)
 
     void Run(RenderThread& aRenderThread, WindowId aWindowId) override {
       aRenderThread.UpdateAndRender(aWindowId, VsyncId(), mStartTime,
@@ -536,7 +536,7 @@ void WebRenderAPI::Pause() {
       MOZ_COUNT_CTOR(PauseEvent);
     }
 
-    virtual ~PauseEvent() { MOZ_COUNT_DTOR(PauseEvent); }
+    MOZ_COUNTED_DTOR_OVERRIDE(PauseEvent)
 
     void Run(RenderThread& aRenderThread, WindowId aWindowId) override {
       aRenderThread.Pause(aWindowId);
@@ -564,7 +564,7 @@ bool WebRenderAPI::Resume() {
       MOZ_COUNT_CTOR(ResumeEvent);
     }
 
-    virtual ~ResumeEvent() { MOZ_COUNT_DTOR(ResumeEvent); }
+    MOZ_COUNTED_DTOR_OVERRIDE(ResumeEvent)
 
     void Run(RenderThread& aRenderThread, WindowId aWindowId) override {
       *mResult = aRenderThread.Resume(aWindowId);
@@ -608,7 +608,7 @@ void WebRenderAPI::WaitFlushed() {
       MOZ_COUNT_CTOR(WaitFlushedEvent);
     }
 
-    virtual ~WaitFlushedEvent() { MOZ_COUNT_DTOR(WaitFlushedEvent); }
+    MOZ_COUNTED_DTOR_OVERRIDE(WaitFlushedEvent)
 
     void Run(RenderThread& aRenderThread, WindowId aWindowId) override {
       layers::AutoCompleteTask complete(mTask);
@@ -676,7 +676,7 @@ WebRenderAPI::WriteCollectedFrames() {
       MOZ_COUNT_CTOR(WriteCollectedFramesEvent);
     }
 
-    ~WriteCollectedFramesEvent() { MOZ_COUNT_DTOR(WriteCollectedFramesEvent); }
+    MOZ_COUNTED_DTOR(WriteCollectedFramesEvent)
 
     void Run(RenderThread& aRenderThread, WindowId aWindowId) override {
       aRenderThread.WriteCollectedFramesForWindow(aWindowId);
@@ -706,7 +706,7 @@ WebRenderAPI::GetCollectedFrames() {
       MOZ_COUNT_CTOR(GetCollectedFramesEvent);
     }
 
-    ~GetCollectedFramesEvent() { MOZ_COUNT_DTOR(GetCollectedFramesEvent); };
+    MOZ_COUNTED_DTOR(GetCollectedFramesEvent);
 
     void Run(RenderThread& aRenderThread, WindowId aWindowId) override {
       Maybe<layers::CollectedFrames> frames =
@@ -858,7 +858,7 @@ class FrameStartTime : public RendererEvent {
     MOZ_COUNT_CTOR(FrameStartTime);
   }
 
-  virtual ~FrameStartTime() { MOZ_COUNT_DTOR(FrameStartTime); }
+  MOZ_COUNTED_DTOR_OVERRIDE(FrameStartTime)
 
   void Run(RenderThread& aRenderThread, WindowId aWindowId) override {
     auto renderer = aRenderThread.GetRenderer(aWindowId);

image/FrameAnimator.h

@@ -283,7 +283,7 @@ class FrameAnimator {
     MOZ_COUNT_CTOR(FrameAnimator);
   }
 
-  ~FrameAnimator() { MOZ_COUNT_DTOR(FrameAnimator); }
+  MOZ_COUNTED_DTOR(FrameAnimator)
 
   /**
    * Call when you need to re-start animating. Ensures we start from the first

intl/strres/nsStringBundle.cpp

@@ -679,9 +679,9 @@ struct bundleCacheEntry_t final : public LinkedListElement<bundleCacheEntry_t> {
   nsCString mHashKey;
   nsCOMPtr<nsIStringBundle> mBundle;
 
-  bundleCacheEntry_t() { MOZ_COUNT_CTOR(bundleCacheEntry_t); }
+  MOZ_COUNTED_DEFAULT_CTOR(bundleCacheEntry_t)
 
-  ~bundleCacheEntry_t() { MOZ_COUNT_DTOR(bundleCacheEntry_t); }
+  MOZ_COUNTED_DTOR(bundleCacheEntry_t)
 };
 
 nsStringBundleService::nsStringBundleService()

ipc/glue/BackgroundParentImpl.cpp

@@ -101,7 +101,7 @@ namespace {
 class TestParent final : public mozilla::ipc::PBackgroundTestParent {
   friend class mozilla::ipc::BackgroundParentImpl;
 
-  TestParent() { MOZ_COUNT_CTOR(TestParent); }
+  MOZ_COUNTED_DEFAULT_CTOR(TestParent)
 
  protected:
   ~TestParent() override { MOZ_COUNT_DTOR(TestParent); }

ipc/glue/WindowsMessageLoop.h

@@ -20,9 +20,9 @@ void InitUIThread();
 
 class DeferredMessage {
  public:
-  DeferredMessage() { MOZ_COUNT_CTOR(DeferredMessage); }
+  MOZ_COUNTED_DEFAULT_CTOR(DeferredMessage)
 
-  virtual ~DeferredMessage() { MOZ_COUNT_DTOR(DeferredMessage); }
+  MOZ_COUNTED_DTOR_OVERRIDE(DeferredMessage)
 
   virtual void Run() = 0;
 };

ipc/ipdl/test/cxx/TestSelfManageRoot.h

@@ -18,8 +18,8 @@ class TestSelfManageParent : public PTestSelfManageParent {
   friend class PTestSelfManageParent;
 
  public:
-  TestSelfManageParent() { MOZ_COUNT_CTOR(TestSelfManageParent); }
-  virtual ~TestSelfManageParent() { MOZ_COUNT_DTOR(TestSelfManageParent); }
+  MOZ_COUNTED_DEFAULT_CTOR(TestSelfManageParent)
+  MOZ_COUNTED_DTOR_OVERRIDE(TestSelfManageParent)
 
   ActorDestroyReason mWhy;
 
@@ -37,7 +37,7 @@ class TestSelfManageRootParent : public PTestSelfManageRootParent {
   friend class PTestSelfManageRootParent;
 
  public:
-  TestSelfManageRootParent() { MOZ_COUNT_CTOR(TestSelfManageRootParent); }
+  MOZ_COUNTED_DEFAULT_CTOR(TestSelfManageRootParent)
   virtual ~TestSelfManageRootParent() {
     MOZ_COUNT_DTOR(TestSelfManageRootParent);
   }
@@ -68,8 +68,8 @@ class TestSelfManageChild : public PTestSelfManageChild {
   friend class PTestSelfManageChild;
 
  public:
-  TestSelfManageChild() { MOZ_COUNT_CTOR(TestSelfManageChild); }
-  virtual ~TestSelfManageChild() { MOZ_COUNT_DTOR(TestSelfManageChild); }
+  MOZ_COUNTED_DEFAULT_CTOR(TestSelfManageChild)
+  MOZ_COUNTED_DTOR_OVERRIDE(TestSelfManageChild)
 
  protected:
   PTestSelfManageChild* AllocPTestSelfManageChild() {
@@ -88,7 +88,7 @@ class TestSelfManageRootChild : public PTestSelfManageRootChild {
   friend class PTestSelfManageRootChild;
 
  public:
-  TestSelfManageRootChild() { MOZ_COUNT_CTOR(TestSelfManageRootChild); }
+  MOZ_COUNTED_DEFAULT_CTOR(TestSelfManageRootChild)
   virtual ~TestSelfManageRootChild() {
     MOZ_COUNT_DTOR(TestSelfManageRootChild);
   }

ipc/ipdl/test/cxx/TestUniquePtrIPC.h

@@ -16,8 +16,8 @@ namespace _ipdltest {
 
 class TestUniquePtrIPCParent : public PTestUniquePtrIPCParent {
  public:
-  TestUniquePtrIPCParent() { MOZ_COUNT_CTOR(TestUniquePtrIPCParent); }
-  virtual ~TestUniquePtrIPCParent() { MOZ_COUNT_DTOR(TestUniquePtrIPCParent); }
+  MOZ_COUNTED_DEFAULT_CTOR(TestUniquePtrIPCParent)
+  MOZ_COUNTED_DTOR_OVERRIDE(TestUniquePtrIPCParent)
 
   static bool RunTestInProcesses() { return true; }
   static bool RunTestInThreads() { return false; }
@@ -37,8 +37,8 @@ class TestUniquePtrIPCParent : public PTestUniquePtrIPCParent {
 
 class TestUniquePtrIPCChild : public PTestUniquePtrIPCChild {
  public:
-  TestUniquePtrIPCChild() { MOZ_COUNT_CTOR(TestUniquePtrIPCChild); }
-  virtual ~TestUniquePtrIPCChild() { MOZ_COUNT_DTOR(TestUniquePtrIPCChild); }
+  MOZ_COUNTED_DEFAULT_CTOR(TestUniquePtrIPCChild)
+  MOZ_COUNTED_DTOR_OVERRIDE(TestUniquePtrIPCChild)
 
   mozilla::ipc::IPCResult RecvTestMessage(UniquePtr<int>&& aA1,
                                           UniquePtr<DummyStruct>&& aA2,

js/xpconnect/src/XPCComponents.cpp

@@ -1716,9 +1716,9 @@ nsXPCComponents_Utils::UnlinkGhostWindows() {
 
 #ifdef NS_FREE_PERMANENT_DATA
 struct IntentionallyLeakedObject {
-  IntentionallyLeakedObject() { MOZ_COUNT_CTOR(IntentionallyLeakedObject); }
+  MOZ_COUNTED_DEFAULT_CTOR(IntentionallyLeakedObject)
 
-  ~IntentionallyLeakedObject() { MOZ_COUNT_DTOR(IntentionallyLeakedObject); }
+  MOZ_COUNTED_DTOR(IntentionallyLeakedObject)
 };
 #endif
 

js/xpconnect/src/xpcprivate.h

@@ -972,8 +972,8 @@ class XPCNativeMember final {
   void SetIndexInInterface(uint16_t index) { mIndexInInterface = index; }
 
   /* default ctor - leave random contents */
-  XPCNativeMember() { MOZ_COUNT_CTOR(XPCNativeMember); }
-  ~XPCNativeMember() { MOZ_COUNT_DTOR(XPCNativeMember); }
+  MOZ_COUNTED_DEFAULT_CTOR(XPCNativeMember)
+  MOZ_COUNTED_DTOR(XPCNativeMember)
 
  private:
   bool Resolve(XPCCallContext& ccx, XPCNativeInterface* iface,

layout/base/nsStyleChangeList.h

@@ -38,8 +38,8 @@ class nsStyleChangeList : private AutoTArray<nsStyleChangeData, 10> {
   using base_type::Length;
   using base_type::operator[];
 
-  nsStyleChangeList() { MOZ_COUNT_CTOR(nsStyleChangeList); }
-  ~nsStyleChangeList() { MOZ_COUNT_DTOR(nsStyleChangeList); }
+  MOZ_COUNTED_DEFAULT_CTOR(nsStyleChangeList)
+  MOZ_COUNTED_DTOR(nsStyleChangeList)
   void AppendChange(nsIFrame* aFrame, nsIContent* aContent, nsChangeHint aHint);
 
   // Starting from the end of the list, removes all changes until the list is

layout/forms/nsButtonFrameRenderer.cpp

@@ -67,11 +67,7 @@ class nsDisplayButtonBoxShadowOuter : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame) {
     MOZ_COUNT_CTOR(nsDisplayButtonBoxShadowOuter);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayButtonBoxShadowOuter() {
-    MOZ_COUNT_DTOR(nsDisplayButtonBoxShadowOuter);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayButtonBoxShadowOuter)
 
   virtual bool CreateWebRenderCommands(
       mozilla::wr::DisplayListBuilder& aBuilder,
@@ -195,9 +191,8 @@ class nsDisplayButtonBorder final : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame), mBFR(aRenderer) {
     MOZ_COUNT_CTOR(nsDisplayButtonBorder);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayButtonBorder() { MOZ_COUNT_DTOR(nsDisplayButtonBorder); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayButtonBorder)
+
   virtual bool MustPaintOnContentSide() const override { return true; }
 
   virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
@@ -301,11 +296,7 @@ class nsDisplayButtonForeground final : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame), mBFR(aRenderer) {
     MOZ_COUNT_CTOR(nsDisplayButtonForeground);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayButtonForeground() {
-    MOZ_COUNT_DTOR(nsDisplayButtonForeground);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayButtonForeground)
 
   nsDisplayItemGeometry* AllocateGeometry(
       nsDisplayListBuilder* aBuilder) override;

layout/forms/nsComboboxControlFrame.cpp

@@ -1466,9 +1466,7 @@ class nsDisplayComboboxFocus : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame) {
     MOZ_COUNT_CTOR(nsDisplayComboboxFocus);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayComboboxFocus() { MOZ_COUNT_DTOR(nsDisplayComboboxFocus); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayComboboxFocus)
 
   virtual void Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) override;
   NS_DISPLAY_DECL_NAME("ComboboxFocus", TYPE_COMBOBOX_FOCUS)

layout/forms/nsFieldSetFrame.cpp

@@ -100,11 +100,8 @@ class nsDisplayFieldSetBorder final : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame) {
     MOZ_COUNT_CTOR(nsDisplayFieldSetBorder);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayFieldSetBorder() {
-    MOZ_COUNT_DTOR(nsDisplayFieldSetBorder);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayFieldSetBorder)
+
   virtual void Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) override;
   virtual nsDisplayItemGeometry* AllocateGeometry(
       nsDisplayListBuilder* aBuilder) override;

layout/forms/nsRangeFrame.cpp

@@ -154,11 +154,7 @@ class nsDisplayRangeFocusRing final : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame) {
     MOZ_COUNT_CTOR(nsDisplayRangeFocusRing);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayRangeFocusRing() {
-    MOZ_COUNT_DTOR(nsDisplayRangeFocusRing);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayRangeFocusRing)
 
   nsDisplayItemGeometry* AllocateGeometry(
       nsDisplayListBuilder* aBuilder) override;

layout/forms/nsSelectsAreaFrame.cpp

@@ -106,9 +106,7 @@ class nsDisplayListFocus : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame) {
     MOZ_COUNT_CTOR(nsDisplayListFocus);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayListFocus() { MOZ_COUNT_DTOR(nsDisplayListFocus); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayListFocus)
 
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
                            bool* aSnap) const override {

layout/generic/nsBulletFrame.cpp

@@ -546,9 +546,7 @@ class nsDisplayBullet final : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame) {
     MOZ_COUNT_CTOR(nsDisplayBullet);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayBullet() { MOZ_COUNT_DTOR(nsDisplayBullet); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayBullet)
 
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
                            bool* aSnap) const override {

layout/generic/nsCanvasFrame.cpp

@@ -455,7 +455,7 @@ class nsDisplayCanvasFocus : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame) {
     MOZ_COUNT_CTOR(nsDisplayCanvasFocus);
   }
-  virtual ~nsDisplayCanvasFocus() { MOZ_COUNT_DTOR(nsDisplayCanvasFocus); }
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayCanvasFocus)
 
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
                            bool* aSnap) const override {

layout/generic/nsColumnSetFrame.cpp

@@ -29,12 +29,7 @@ class nsDisplayColumnRule : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame) {
     MOZ_COUNT_CTOR(nsDisplayColumnRule);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayColumnRule() {
-    MOZ_COUNT_DTOR(nsDisplayColumnRule);
-    mBorderRenderers.Clear();
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayColumnRule)
 
   /**
    * Returns the frame's visual overflow rect instead of the frame's bounds.

layout/generic/nsFrame.cpp

@@ -932,7 +932,8 @@ static void CompareLayers(
     // be different with the corresponded one in aSecondLayers
     if (!aSecondLayers || i >= aSecondLayers->mImageCount ||
         (!aSecondLayers->mLayers[i].mImage.IsResolved() ||
-         image.GetImageRequest() != aSecondLayers->mLayers[i].mImage.GetImageRequest())) {
+         image.GetImageRequest() !=
+             aSecondLayers->mLayers[i].mImage.GetImageRequest())) {
       if (imgRequestProxy* req = image.GetImageRequest()) {
         aCallback(req);
       }
@@ -2319,11 +2320,7 @@ class nsDisplaySelectionOverlay : public nsPaintedDisplayItem {
         mSelectionValue(aSelectionValue) {
     MOZ_COUNT_CTOR(nsDisplaySelectionOverlay);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplaySelectionOverlay() {
-    MOZ_COUNT_DTOR(nsDisplaySelectionOverlay);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplaySelectionOverlay)
 
   virtual void Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) override;
   bool CreateWebRenderCommands(
@@ -11720,7 +11717,7 @@ struct DR_FrameTreeNode {
     MOZ_COUNT_CTOR(DR_FrameTreeNode);
   }
 
-  ~DR_FrameTreeNode() { MOZ_COUNT_DTOR(DR_FrameTreeNode); }
+  MOZ_COUNTED_DTOR(DR_FrameTreeNode)
 
   nsIFrame* mFrame;
   DR_FrameTreeNode* mParent;

layout/generic/nsFrameSelection.h

@@ -34,9 +34,8 @@ struct SelectionDetails {
       : mStart(), mEnd(), mSelectionType(mozilla::SelectionType::eInvalid) {
     MOZ_COUNT_CTOR(SelectionDetails);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~SelectionDetails() { MOZ_COUNT_DTOR(SelectionDetails); }
-#endif
+  MOZ_COUNTED_DTOR(SelectionDetails)
+
   int32_t mStart;
   int32_t mEnd;
   mozilla::SelectionType mSelectionType;
@@ -46,8 +45,8 @@ struct SelectionDetails {
 
 struct SelectionCustomColors {
 #ifdef NS_BUILD_REFCNT_LOGGING
-  SelectionCustomColors() { MOZ_COUNT_CTOR(SelectionCustomColors); }
-  ~SelectionCustomColors() { MOZ_COUNT_DTOR(SelectionCustomColors); }
+  MOZ_COUNTED_DEFAULT_CTOR(SelectionCustomColors)
+  MOZ_COUNTED_DTOR(SelectionCustomColors)
 #endif
   mozilla::Maybe<nscolor> mForegroundColor;
   mozilla::Maybe<nscolor> mBackgroundColor;
@@ -869,7 +868,7 @@ class nsFrameSelection final {
 
   bool mChangesDuringBatching = false;
   bool mDragSelectingCells = false;
-  bool mDragState = false;             // for drag purposes
+  bool mDragState = false;  // for drag purposes
   bool mDesiredPosSet = false;
   bool mAccessibleCaretEnabled = false;
 

layout/generic/nsFrameSetFrame.cpp

@@ -1333,11 +1333,7 @@ class nsDisplayFramesetBorder : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame) {
     MOZ_COUNT_CTOR(nsDisplayFramesetBorder);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayFramesetBorder() {
-    MOZ_COUNT_DTOR(nsDisplayFramesetBorder);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayFramesetBorder)
 
   // REVIEW: see old GetFrameForPoint
   // Receives events in its bounds
@@ -1520,9 +1516,7 @@ class nsDisplayFramesetBlank : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame) {
     MOZ_COUNT_CTOR(nsDisplayFramesetBlank);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayFramesetBlank() { MOZ_COUNT_DTOR(nsDisplayFramesetBlank); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayFramesetBlank)
 
   virtual void Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) override;
   NS_DISPLAY_DECL_NAME("FramesetBlank", TYPE_FRAMESET_BLANK)

layout/generic/nsHTMLCanvasFrame.cpp

@@ -63,9 +63,7 @@ class nsDisplayCanvas final : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame) {
     MOZ_COUNT_CTOR(nsDisplayCanvas);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayCanvas() { MOZ_COUNT_DTOR(nsDisplayCanvas); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayCanvas)
 
   NS_DISPLAY_DECL_NAME("nsDisplayCanvas", TYPE_CANVAS)
 

layout/generic/nsLineBox.h

@@ -34,7 +34,7 @@ class nsFloatCache {
 #ifdef NS_BUILD_REFCNT_LOGGING
   ~nsFloatCache();
 #else
-  ~nsFloatCache() {}
+  ~nsFloatCache() = default;
 #endif
 
   nsFloatCache* Next() const { return mNext; }
@@ -100,7 +100,7 @@ class nsFloatCacheFreeList : private nsFloatCacheList {
   ~nsFloatCacheFreeList();
 #else
   nsFloatCacheFreeList() : mTail(nullptr) {}
-  ~nsFloatCacheFreeList() {}
+  ~nsFloatCacheFreeList() = default;
 #endif
 
   // Reimplement trivial functions
@@ -1291,7 +1291,7 @@ class nsLineList {
     clear();
   }
 
-  ~nsLineList() { MOZ_COUNT_DTOR(nsLineList); }
+  MOZ_COUNTED_DTOR(nsLineList)
 
   const_iterator begin() const {
     const_iterator rv;

layout/generic/nsPageFrame.cpp

@@ -447,9 +447,7 @@ class nsDisplayHeaderFooter final : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame) {
     MOZ_COUNT_CTOR(nsDisplayHeaderFooter);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayHeaderFooter() { MOZ_COUNT_DTOR(nsDisplayHeaderFooter); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayHeaderFooter)
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
                      gfxContext* aCtx) override {

layout/generic/nsPluginFrame.h

@@ -360,9 +360,7 @@ class nsDisplayPlugin final : public nsPaintedDisplayItem {
     MOZ_COUNT_CTOR(nsDisplayPlugin);
     aBuilder->SetContainsPluginItem();
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayPlugin() { MOZ_COUNT_DTOR(nsDisplayPlugin); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayPlugin)
 
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
                            bool* aSnap) const override;

layout/generic/nsVideoFrame.cpp

@@ -406,7 +406,7 @@ class nsDisplayVideo : public nsPaintedDisplayItem {
     MOZ_COUNT_CTOR(nsDisplayVideo);
   }
 #ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayVideo() { MOZ_COUNT_DTOR(nsDisplayVideo); }
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayVideo)
 #endif
 
   NS_DISPLAY_DECL_NAME("Video", TYPE_VIDEO)

layout/mathml/nsMathMLChar.cpp

@@ -170,7 +170,7 @@ class nsPropertiesTable final : public nsGlyphTable {
         aPrimaryFontName, StyleFontFamilyNameSyntax::Identifiers));
   }
 
-  ~nsPropertiesTable() { MOZ_COUNT_DTOR(nsPropertiesTable); }
+  MOZ_COUNTED_DTOR(nsPropertiesTable)
 
   const FontFamilyName& PrimaryFontName() const { return mGlyphCodeFonts[0]; }
 
@@ -378,7 +378,7 @@ already_AddRefed<gfxTextRun> nsPropertiesTable::MakeTextRun(
 // forwarded to the gfx code.
 class nsOpenTypeTable final : public nsGlyphTable {
  public:
-  ~nsOpenTypeTable() { MOZ_COUNT_DTOR(nsOpenTypeTable); }
+  MOZ_COUNTED_DTOR(nsOpenTypeTable)
 
   virtual nsGlyphCode ElementAt(DrawTarget* aDrawTarget,
                                 int32_t aAppUnitsPerDevPixel,
@@ -1689,11 +1689,7 @@ class nsDisplayMathMLSelectionRect final : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame), mRect(aRect) {
     MOZ_COUNT_CTOR(nsDisplayMathMLSelectionRect);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayMathMLSelectionRect() {
-    MOZ_COUNT_DTOR(nsDisplayMathMLSelectionRect);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayMathMLSelectionRect)
 
   virtual void Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) override;
   NS_DISPLAY_DECL_NAME("MathMLSelectionRect", TYPE_MATHML_SELECTION_RECT)
@@ -1724,11 +1720,7 @@ class nsDisplayMathMLCharForeground final : public nsPaintedDisplayItem {
         mIsSelected(aIsSelected) {
     MOZ_COUNT_CTOR(nsDisplayMathMLCharForeground);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayMathMLCharForeground() {
-    MOZ_COUNT_DTOR(nsDisplayMathMLCharForeground);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayMathMLCharForeground)
 
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
                            bool* aSnap) const override {
@@ -1774,11 +1766,7 @@ class nsDisplayMathMLCharDebug final : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame), mRect(aRect) {
     MOZ_COUNT_CTOR(nsDisplayMathMLCharDebug);
   }
-#  ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayMathMLCharDebug() {
-    MOZ_COUNT_DTOR(nsDisplayMathMLCharDebug);
-  }
-#  endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayMathMLCharDebug)
 
   virtual void Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) override;
   NS_DISPLAY_DECL_NAME("MathMLCharDebug", TYPE_MATHML_CHAR_DEBUG)

layout/mathml/nsMathMLContainerFrame.cpp

@@ -74,9 +74,7 @@ class nsDisplayMathMLError : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame) {
     MOZ_COUNT_CTOR(nsDisplayMathMLError);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayMathMLError() { MOZ_COUNT_DTOR(nsDisplayMathMLError); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayMathMLError)
 
   virtual void Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) override;
   NS_DISPLAY_DECL_NAME("MathMLError", TYPE_MATHML_ERROR)

layout/mathml/nsMathMLFrame.cpp

@@ -263,11 +263,7 @@ class nsDisplayMathMLBoundingMetrics final : public nsDisplayItem {
       : nsDisplayItem(aBuilder, aFrame), mRect(aRect) {
     MOZ_COUNT_CTOR(nsDisplayMathMLBoundingMetrics);
   }
-#  ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayMathMLBoundingMetrics() {
-    MOZ_COUNT_DTOR(nsDisplayMathMLBoundingMetrics);
-  }
-#  endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayMathMLBoundingMetrics)
 
   virtual void Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) override;
   NS_DISPLAY_DECL_NAME("MathMLBoundingMetrics", TYPE_MATHML_BOUNDING_METRICS)
@@ -307,9 +303,7 @@ class nsDisplayMathMLBar final : public nsPaintedDisplayItem {
       : nsPaintedDisplayItem(aBuilder, aFrame), mRect(aRect), mIndex(aIndex) {
     MOZ_COUNT_CTOR(nsDisplayMathMLBar);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayMathMLBar() { MOZ_COUNT_DTOR(nsDisplayMathMLBar); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayMathMLBar)
 
   virtual uint16_t CalculatePerFrameKey() const override { return mIndex; }
 

layout/mathml/nsMathMLmencloseFrame.cpp

@@ -722,9 +722,7 @@ class nsDisplayNotation final : public nsPaintedDisplayItem {
         mType(aType) {
     MOZ_COUNT_CTOR(nsDisplayNotation);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayNotation() { MOZ_COUNT_DTOR(nsDisplayNotation); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayNotation)
 
   virtual uint16_t CalculatePerFrameKey() const override { return mType; }
 

layout/mathml/nsMathMLmfracFrame.cpp

@@ -610,9 +610,7 @@ class nsDisplayMathMLSlash : public nsPaintedDisplayItem {
         mThickness(aThickness) {
     MOZ_COUNT_CTOR(nsDisplayMathMLSlash);
   }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayMathMLSlash() { MOZ_COUNT_DTOR(nsDisplayMathMLSlash); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayMathMLSlash)
 
   virtual void Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) override;
   NS_DISPLAY_DECL_NAME("MathMLSlash", TYPE_MATHML_SLASH)

layout/painting/MaskLayerImageCache.h

@@ -69,7 +69,7 @@ class MaskLayerImageCache {
       }
     }
 
-    ~PixelRoundedRect() { MOZ_COUNT_DTOR(PixelRoundedRect); }
+    MOZ_COUNTED_DTOR(PixelRoundedRect)
 
     // Applies the scale and translate components of aTransform.
     // It is an error to pass a matrix which does more than just scale
@@ -226,7 +226,7 @@ class MaskLayerImageCache {
         : mKey(aOther.mKey.get()) {
       NS_ERROR("ALLOW_MEMMOVE == true, should never be called");
     }
-    ~MaskLayerImageEntry() { MOZ_COUNT_DTOR(MaskLayerImageEntry); }
+    MOZ_COUNTED_DTOR(MaskLayerImageEntry)
 
     // KeyEquals(): does this entry match this key?
     bool KeyEquals(KeyTypePointer aKey) const { return *mKey == *aKey; }

layout/painting/TransformClipNode.h

@@ -126,7 +126,7 @@ class TransformClipNode {
   }
 
  private:
-  ~TransformClipNode() { MOZ_COUNT_DTOR(TransformClipNode); }
+  MOZ_COUNTED_DTOR(TransformClipNode)
 
   const RefPtr<TransformClipNode> mParent;
   const gfx::Matrix4x4Flagged mTransform;

layout/painting/nsDisplayList.h

@@ -2490,7 +2490,7 @@ class nsDisplayItem : public nsDisplayItemBase {
   nsDisplayItem(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
                 const ActiveScrolledRoot* aActiveScrolledRoot);
 
-  virtual ~nsDisplayItem() { MOZ_COUNT_DTOR(nsDisplayItem); }
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayItem)
 
   /**
    * The custom copy-constructor is implemented to prevent copying the saved
@@ -4098,9 +4098,7 @@ class nsDisplayGeneric : public nsPaintedDisplayItem {
     return DisplayItemType::TYPE_GENERIC;
   }
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayGeneric() override { MOZ_COUNT_DTOR(nsDisplayGeneric); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayGeneric)
 
   void Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) override {
     MOZ_ASSERT(!!mPaint != !!mOldPaint);
@@ -4156,9 +4154,7 @@ class nsDisplayReflowCount : public nsPaintedDisplayItem {
     MOZ_COUNT_CTOR(nsDisplayReflowCount);
   }
 
-#  ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayReflowCount() override { MOZ_COUNT_DTOR(nsDisplayReflowCount); }
-#  endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayReflowCount)
 
   NS_DISPLAY_DECL_NAME("nsDisplayReflowCount", TYPE_REFLOW_COUNT)
 
@@ -4240,9 +4236,7 @@ class nsDisplayBorder : public nsPaintedDisplayItem {
  public:
   nsDisplayBorder(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame);
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayBorder() override { MOZ_COUNT_DTOR(nsDisplayBorder); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayBorder)
 
   NS_DISPLAY_DECL_NAME("Border", TYPE_BORDER)
 
@@ -4405,9 +4399,7 @@ class nsDisplaySolidColor : public nsDisplaySolidColorBase {
     }
   }
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplaySolidColor() override { MOZ_COUNT_DTOR(nsDisplaySolidColor); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplaySolidColor)
 
   NS_DISPLAY_DECL_NAME("SolidColor", TYPE_SOLID_COLOR)
 
@@ -4470,11 +4462,7 @@ class nsDisplaySolidColorRegion : public nsPaintedDisplayItem {
     MOZ_COUNT_CTOR(nsDisplaySolidColorRegion);
   }
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplaySolidColorRegion() override {
-    MOZ_COUNT_DTOR(nsDisplaySolidColorRegion);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplaySolidColorRegion)
 
   NS_DISPLAY_DECL_NAME("SolidColorRegion", TYPE_SOLID_COLOR_REGION)
 
@@ -4781,13 +4769,7 @@ class nsDisplayThemedBackground : public nsPaintedDisplayItem {
   nsDisplayThemedBackground(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
                             const nsRect& aBackgroundRect);
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayThemedBackground() override {
-    MOZ_COUNT_DTOR(nsDisplayThemedBackground);
-  }
-#else
-  ~nsDisplayThemedBackground() override = default;
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayThemedBackground)
 
   NS_DISPLAY_DECL_NAME("ThemedBackground", TYPE_THEMED_BACKGROUND)
 
@@ -5138,11 +5120,7 @@ class nsDisplayBoxShadowOuter final : public nsPaintedDisplayItem {
     mBounds = GetBoundsInternal();
   }
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayBoxShadowOuter() override {
-    MOZ_COUNT_DTOR(nsDisplayBoxShadowOuter);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayBoxShadowOuter)
 
   NS_DISPLAY_DECL_NAME("BoxShadowOuter", TYPE_BOX_SHADOW_OUTER)
 
@@ -5200,11 +5178,7 @@ class nsDisplayBoxShadowInner : public nsPaintedDisplayItem {
     MOZ_COUNT_CTOR(nsDisplayBoxShadowInner);
   }
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayBoxShadowInner() override {
-    MOZ_COUNT_DTOR(nsDisplayBoxShadowInner);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayBoxShadowInner)
 
   NS_DISPLAY_DECL_NAME("BoxShadowInner", TYPE_BOX_SHADOW_INNER)
 
@@ -5263,9 +5237,7 @@ class nsDisplayOutline final : public nsPaintedDisplayItem {
     MOZ_COUNT_CTOR(nsDisplayOutline);
   }
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayOutline() override { MOZ_COUNT_DTOR(nsDisplayOutline); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayOutline)
 
   NS_DISPLAY_DECL_NAME("Outline", TYPE_OUTLINE)
 
@@ -5300,9 +5272,7 @@ class nsDisplayEventReceiver final : public nsDisplayItem {
     MOZ_COUNT_CTOR(nsDisplayEventReceiver);
   }
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayEventReceiver() final { MOZ_COUNT_DTOR(nsDisplayEventReceiver); }
-#endif
+  MOZ_COUNTED_DTOR_FINAL(nsDisplayEventReceiver)
 
   NS_DISPLAY_DECL_NAME("EventReceiver", TYPE_EVENT_RECEIVER)
 
@@ -5328,11 +5298,7 @@ class nsDisplayCompositorHitTestInfo : public nsDisplayHitTestInfoBase {
       nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
       mozilla::UniquePtr<HitTestInfo>&& aHitTestInfo);
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayCompositorHitTestInfo() override {
-    MOZ_COUNT_DTOR(nsDisplayCompositorHitTestInfo);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayCompositorHitTestInfo)
 
   NS_DISPLAY_DECL_NAME("CompositorHitTestInfo", TYPE_COMPOSITOR_HITTEST_INFO)
 
@@ -5686,9 +5652,7 @@ class nsDisplayOpacity : public nsDisplayWrapList {
   void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
                HitTestState* aState, nsTArray<nsIFrame*>* aOutFrames) override;
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayOpacity() override { MOZ_COUNT_DTOR(nsDisplayOpacity); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayOpacity)
 
   NS_DISPLAY_DECL_NAME("Opacity", TYPE_OPACITY)
 
@@ -5813,9 +5777,7 @@ class nsDisplayBlendMode : public nsDisplayWrapList {
     MOZ_COUNT_CTOR(nsDisplayBlendMode);
   }
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayBlendMode() override { MOZ_COUNT_DTOR(nsDisplayBlendMode); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayBlendMode)
 
   NS_DISPLAY_DECL_NAME("BlendMode", TYPE_BLEND_MODE)
 
@@ -5926,11 +5888,7 @@ class nsDisplayBlendContainer : public nsDisplayWrapList {
       nsDisplayListBuilder* aBuilder, nsIFrame* aFrame, nsDisplayList* aList,
       const ActiveScrolledRoot* aActiveScrolledRoot);
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayBlendContainer() override {
-    MOZ_COUNT_DTOR(nsDisplayBlendContainer);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayBlendContainer)
 
   NS_DISPLAY_DECL_NAME("BlendContainer", TYPE_BLEND_CONTAINER)
 
@@ -6101,9 +6059,7 @@ class nsDisplayOwnLayer : public nsDisplayWrapList {
     MOZ_COUNT_CTOR(nsDisplayOwnLayer);
   }
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayOwnLayer() override { MOZ_COUNT_DTOR(nsDisplayOwnLayer); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayOwnLayer)
 
   NS_DISPLAY_DECL_NAME("OwnLayer", TYPE_OWN_LAYER)
 
@@ -6163,9 +6119,7 @@ class nsDisplayRenderRoot : public nsDisplayWrapList {
                       const ActiveScrolledRoot* aActiveScrolledRoot,
                       mozilla::wr::RenderRoot aRenderRoot);
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayRenderRoot() override { MOZ_COUNT_DTOR(nsDisplayRenderRoot); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayRenderRoot)
 
   NS_DISPLAY_DECL_NAME("RenderRoot", TYPE_RENDER_ROOT)
 
@@ -6262,9 +6216,7 @@ class nsDisplayResolution : public nsDisplaySubDocument {
   nsDisplayResolution(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
                       nsSubDocumentFrame* aSubDocFrame, nsDisplayList* aList,
                       nsDisplayOwnLayerFlags aFlags);
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayResolution() override { MOZ_COUNT_DTOR(nsDisplayResolution); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayResolution)
 
   NS_DISPLAY_DECL_NAME("Resolution", TYPE_RESOLUTION)
 
@@ -6293,11 +6245,7 @@ class nsDisplayStickyPosition : public nsDisplayOwnLayer {
     MOZ_COUNT_CTOR(nsDisplayStickyPosition);
   }
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayStickyPosition() override {
-    MOZ_COUNT_DTOR(nsDisplayStickyPosition);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayStickyPosition)
 
   void SetClipChain(const DisplayItemClipChain* aClipChain,
                     bool aStore) override;
@@ -6351,9 +6299,7 @@ class nsDisplayFixedPosition : public nsDisplayOwnLayer {
       nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
       nsDisplayBackgroundImage* aImage, uint16_t aIndex);
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayFixedPosition() override { MOZ_COUNT_DTOR(nsDisplayFixedPosition); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayFixedPosition)
 
   NS_DISPLAY_DECL_NAME("FixedPosition", TYPE_FIXED_POSITION)
 
@@ -6461,11 +6407,7 @@ class nsDisplayScrollInfoLayer : public nsDisplayWrapList {
   nsDisplayScrollInfoLayer(nsDisplayListBuilder* aBuilder,
                            nsIFrame* aScrolledFrame, nsIFrame* aScrollFrame);
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayScrollInfoLayer() override {
-    MOZ_COUNT_DTOR(nsDisplayScrollInfoLayer);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayScrollInfoLayer)
 
   NS_DISPLAY_DECL_NAME("ScrollInfoLayer", TYPE_SCROLL_INFO_LAYER)
 
@@ -6522,9 +6464,7 @@ class nsDisplayZoom : public nsDisplaySubDocument {
                 int32_t aAPD, int32_t aParentAPD,
                 nsDisplayOwnLayerFlags aFlags = nsDisplayOwnLayerFlags::None);
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayZoom() override { MOZ_COUNT_DTOR(nsDisplayZoom); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayZoom)
 
   NS_DISPLAY_DECL_NAME("Zoom", TYPE_ZOOM)
 
@@ -6609,9 +6549,7 @@ class nsDisplayEffectsBase : public nsDisplayWrapList {
     MOZ_COUNT_CTOR(nsDisplayEffectsBase);
   }
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayEffectsBase() override { MOZ_COUNT_DTOR(nsDisplayEffectsBase); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayEffectsBase)
 
   nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
                            bool* aSnap) const override;
@@ -6669,11 +6607,7 @@ class nsDisplayMasksAndClipPaths : public nsDisplayEffectsBase {
     MOZ_COUNT_CTOR(nsDisplayMasksAndClipPaths);
   }
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayMasksAndClipPaths() override {
-    MOZ_COUNT_DTOR(nsDisplayMasksAndClipPaths);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayMasksAndClipPaths)
 
   NS_DISPLAY_DECL_NAME("Mask", TYPE_MASK)
 
@@ -6758,11 +6692,7 @@ class nsDisplayBackdropRootContainer : public nsDisplayWrapList {
     MOZ_COUNT_CTOR(nsDisplayBackdropRootContainer);
   }
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayBackdropRootContainer() override {
-    MOZ_COUNT_DTOR(nsDisplayBackdropRootContainer);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayBackdropRootContainer)
 
   NS_DISPLAY_DECL_NAME("BackdropRootContainer", TYPE_BACKDROP_ROOT_CONTAINER)
 
@@ -6794,11 +6724,7 @@ class nsDisplayBackdropFilters : public nsDisplayWrapList {
     MOZ_COUNT_CTOR(nsDisplayBackdropFilters);
   }
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayBackdropFilters() override {
-    MOZ_COUNT_DTOR(nsDisplayBackdropFilters);
-  }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayBackdropFilters)
 
   NS_DISPLAY_DECL_NAME("BackdropFilter", TYPE_BACKDROP_FILTER)
 
@@ -6839,9 +6765,7 @@ class nsDisplayFilters : public nsDisplayEffectsBase {
     MOZ_COUNT_CTOR(nsDisplayFilters);
   }
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayFilters() override { MOZ_COUNT_DTOR(nsDisplayFilters); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayFilters)
 
   NS_DISPLAY_DECL_NAME("Filter", TYPE_FILTER)
 
@@ -6954,9 +6878,7 @@ class nsDisplayTransform : public nsDisplayHitTestInfoBase {
                      uint16_t aIndex,
                      ComputeTransformFunction aTransformGetter);
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplayTransform() override { MOZ_COUNT_DTOR(nsDisplayTransform); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayTransform)
 
   NS_DISPLAY_DECL_NAME("nsDisplayTransform", TYPE_TRANSFORM)
 
@@ -7382,9 +7304,7 @@ class nsDisplayText final : public nsPaintedDisplayItem {
  public:
   nsDisplayText(nsDisplayListBuilder* aBuilder, nsTextFrame* aFrame,
                 const mozilla::Maybe<bool>& aIsSelected);
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayText() { MOZ_COUNT_DTOR(nsDisplayText); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplayText)
 
   NS_DISPLAY_DECL_NAME("Text", TYPE_TEXT)
 
@@ -7508,9 +7428,7 @@ class nsDisplaySVGWrapper : public nsDisplayWrapList {
   nsDisplaySVGWrapper(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
                       nsDisplayList* aList);
 
-#ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplaySVGWrapper() override { MOZ_COUNT_DTOR(nsDisplaySVGWrapper); }
-#endif
+  MOZ_COUNTED_DTOR_OVERRIDE(nsDisplaySVGWrapper)
 
   NS_DISPLAY_DECL_NAME("SVGWrapper", TYPE_SVG_WRAPPER)
 

layout/style/DocumentStyleRootIterator.h

@@ -31,7 +31,7 @@ class Element;
 class DocumentStyleRootIterator {
  public:
   explicit DocumentStyleRootIterator(nsINode* aStyleRoot);
-  ~DocumentStyleRootIterator() { MOZ_COUNT_DTOR(DocumentStyleRootIterator); }
+  MOZ_COUNTED_DTOR(DocumentStyleRootIterator)
 
   dom::Element* GetNextStyleRoot();