Backed out 2 changesets (bug 1613985) for Build bustage on Windows2012. CLOSED TREE

Backed out changeset fd177b40b561 (bug 1613985)
Backed out changeset fb6d62b7f28d (bug 1613985)

Author: dgluca

accessible/base/AccGroupInfo.h

@@ -15,7 +15,7 @@ namespace a11y {
  */
 class AccGroupInfo {
  public:
-  MOZ_COUNTED_DTOR(AccGroupInfo)
+  ~AccGroupInfo() { MOZ_COUNT_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);
   }
-  MOZ_COUNTED_DTOR(InsertIterator)
+  ~InsertIterator() { MOZ_COUNT_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);
   }
 
-  MOZ_COUNTED_DTOR(ProxyAccessible)
+  ~ProxyAccessible() { MOZ_COUNT_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);
   }
 
-  MOZ_COUNTED_DTOR(ProxyAccessible)
+  ~ProxyAccessible() { MOZ_COUNT_DTOR(ProxyAccessible); }
 
 #include "mozilla/a11y/ProxyAccessibleShared.h"
 

dom/base/ChildIterator.h

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

dom/base/DirectionalityUtils.cpp

@@ -508,7 +508,9 @@ class nsTextNodeDirectionalityMap {
     aTextNode->SetHasTextNodeDirectionalityMap();
   }
 
-  MOZ_COUNTED_DTOR(nsTextNodeDirectionalityMap)
+  ~nsTextNodeDirectionalityMap() {
+    MOZ_COUNT_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:
-  MOZ_COUNTED_DEFAULT_CTOR(FullscreenRoots)
-  MOZ_COUNTED_DTOR(FullscreenRoots)
+  FullscreenRoots() { MOZ_COUNT_CTOR(FullscreenRoots); }
+  ~FullscreenRoots() { MOZ_COUNT_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; }
 
-    MOZ_COUNTED_DTOR(SelectorCacheKey)
+    ~SelectorCacheKey() { MOZ_COUNT_DTOR(SelectorCacheKey); }
   };
 
   class SelectorCacheKeyDeleter;

dom/base/FullscreenChange.h

@@ -89,7 +89,7 @@ class FullscreenRequest : public FullscreenChange {
                                             dom::CallerType::NonSystem, false));
   }
 
-  MOZ_COUNTED_DTOR(FullscreenRequest)
+  ~FullscreenRequest() { MOZ_COUNT_DTOR(FullscreenRequest); }
 
   dom::Element* Element() const { return mElement; }
 
@@ -149,7 +149,7 @@ class FullscreenExit : public FullscreenChange {
     return WrapUnique(new FullscreenExit(aDoc, nullptr));
   }
 
-  MOZ_COUNTED_DTOR(FullscreenExit)
+  ~FullscreenExit() { MOZ_COUNT_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); }
 
-  MOZ_COUNTED_DTOR(StringBuilder)
+  ~StringBuilder() { MOZ_COUNT_DTOR(StringBuilder); }
 
   void Append(nsAtom* aAtom) {
     Unit* u = AddUnit();

dom/base/nsFrameMessageManager.h

@@ -402,7 +402,9 @@ struct nsMessageManagerScriptHolder {
     MOZ_COUNT_CTOR(nsMessageManagerScriptHolder);
   }
 
-  MOZ_COUNTED_DTOR(nsMessageManagerScriptHolder)
+  ~nsMessageManagerScriptHolder() {
+    MOZ_COUNT_DTOR(nsMessageManagerScriptHolder);
+  }
 
   JS::PersistentRooted<JSScript*> mScript;
 };
@@ -419,7 +421,9 @@ class nsMessageManagerScriptExecutor {
   nsMessageManagerScriptExecutor() {
     MOZ_COUNT_CTOR(nsMessageManagerScriptExecutor);
   }
-  MOZ_COUNTED_DTOR(nsMessageManagerScriptExecutor)
+  ~nsMessageManagerScriptExecutor() {
+    MOZ_COUNT_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:
-  MOZ_COUNTED_DEFAULT_CTOR(NonRefcountedDOMObject)
+  NonRefcountedDOMObject() { MOZ_COUNT_CTOR(NonRefcountedDOMObject); }
 
-  MOZ_COUNTED_DTOR(NonRefcountedDOMObject)
+  ~NonRefcountedDOMObject() { MOZ_COUNT_DTOR(NonRefcountedDOMObject); }
 
   NonRefcountedDOMObject(const NonRefcountedDOMObject& aOther)
       : NonRefcountedDOMObject() {}

dom/canvas/TextMetrics.h

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

dom/encoding/TextDecoder.h

@@ -40,7 +40,7 @@ class TextDecoder final : public NonRefcountedDOMObject {
     MOZ_COUNT_CTOR(TextDecoder);
   }
 
-  MOZ_COUNTED_DTOR(TextDecoder)
+  ~TextDecoder() { MOZ_COUNT_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);
   }
 
-  MOZ_COUNTED_DTOR(EventTargetChainItem)
+  ~EventTargetChainItem() { MOZ_COUNT_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);
   }
 
-  MOZ_COUNTED_DTOR(PointerCaptureInfo)
+  ~PointerCaptureInfo() { MOZ_COUNT_DTOR(PointerCaptureInfo); }
 
   bool Empty() { return !(mPendingContent || mOverrideContent); }
 };

dom/html/HTMLFormSubmission.h

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

dom/indexedDB/ActorsParent.cpp

@@ -532,7 +532,7 @@ struct IndexDataValue final {
     MOZ_COUNT_CTOR(IndexDataValue);
   }
 
-  MOZ_COUNTED_DTOR(IndexDataValue)
+  ~IndexDataValue() { MOZ_COUNT_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;
   }
 
-  MOZ_COUNTED_DTOR(StructuredCloneWriteInfo)
+  ~StructuredCloneWriteInfo() { MOZ_COUNT_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;
 
-  MOZ_COUNTED_DEFAULT_CTOR(MutableFileData)
+  MutableFileData() { MOZ_COUNT_CTOR(MutableFileData); }
 
-  MOZ_COUNTED_DTOR(MutableFileData)
+  ~MutableFileData() { MOZ_COUNT_DTOR(MutableFileData); }
 };
 
 struct MOZ_STACK_CLASS BlobOrFileData final {
@@ -151,7 +151,7 @@ struct MOZ_STACK_CLASS BlobOrFileData final {
     MOZ_COUNT_CTOR(BlobOrFileData);
   }
 
-  MOZ_COUNTED_DTOR(BlobOrFileData)
+  ~BlobOrFileData() { MOZ_COUNT_DTOR(BlobOrFileData); }
 };
 
 struct MOZ_STACK_CLASS WasmModuleData final {
@@ -164,7 +164,7 @@ struct MOZ_STACK_CLASS WasmModuleData final {
     MOZ_COUNT_CTOR(WasmModuleData);
   }
 
-  MOZ_COUNTED_DTOR(WasmModuleData)
+  ~WasmModuleData() { MOZ_COUNT_DTOR(WasmModuleData); }
 };
 
 struct MOZ_STACK_CLASS GetAddInfoClosure final {
@@ -177,7 +177,7 @@ struct MOZ_STACK_CLASS GetAddInfoClosure final {
     MOZ_COUNT_CTOR(GetAddInfoClosure);
   }
 
-  MOZ_COUNTED_DTOR(GetAddInfoClosure)
+  ~GetAddInfoClosure() { MOZ_COUNT_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);
     }
 
-    MOZ_COUNTED_DTOR_NESTED(ValueWrapper, IDBObjectStore::ValueWrapper)
+    ~ValueWrapper() { MOZ_COUNT_DTOR(IDBObjectStore::ValueWrapper); }
 
     const JS::Rooted<JS::Value>& Value() const { return mValue; }
 

dom/indexedDB/KeyPath.h

@@ -42,7 +42,7 @@ class KeyPath {
     *this = aOther;
   }
 
-  MOZ_COUNTED_DTOR(KeyPath)
+  ~KeyPath() { MOZ_COUNT_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:
-  MOZ_COUNTED_DTOR(CycleCollectWithLogsParent)
+  ~CycleCollectWithLogsParent() { MOZ_COUNT_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();
-  MOZ_COUNTED_DTOR(ContentProcessManager);
+  ~ContentProcessManager() { MOZ_COUNT_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;
 
-  MOZ_COUNTED_DEFAULT_CTOR(ContentProcessManager);
+  ContentProcessManager() { MOZ_COUNT_CTOR(ContentProcessManager); };
 };
 
 }  // namespace dom

dom/media/MediaFormatReader.cpp

@@ -453,7 +453,7 @@ class MediaFormatReader::DemuxerProxy {
     MOZ_COUNT_CTOR(DemuxerProxy);
   }
 
-  MOZ_COUNTED_DTOR(DemuxerProxy)
+  ~DemuxerProxy() { MOZ_COUNT_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;
 
-  MOZ_COUNTED_DTOR_VIRTUAL(TrackInfo)
+  virtual ~TrackInfo() { MOZ_COUNT_DTOR(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;
 
-  MOZ_COUNTED_DTOR_VIRTUAL(MediaSegment)
+  virtual ~MediaSegment() { MOZ_COUNT_DTOR(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():
-  MOZ_COUNTED_DTOR(MediaInputPort)
+  ~MediaInputPort() { MOZ_COUNT_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);
   }
-  MOZ_COUNTED_DTOR_VIRTUAL(MediaTrackGraph)
+  virtual ~MediaTrackGraph() { MOZ_COUNT_DTOR(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
-  MOZ_COUNTED_DTOR_VIRTUAL(ControlMessage)
+  virtual ~ControlMessage() { MOZ_COUNT_DTOR(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 {
     }
   };
 
-  MOZ_COUNTED_DTOR_VIRTUAL(VideoFrameConverter)
+  virtual ~VideoFrameConverter() { MOZ_COUNT_DTOR(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); }
-    MOZ_COUNTED_DTOR(Context)
+    ~Context() { MOZ_COUNT_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:
-  MOZ_COUNTED_DEFAULT_CTOR(GetNodeIdCallback)
-  MOZ_COUNTED_DTOR_VIRTUAL(GetNodeIdCallback)
+  GetNodeIdCallback() { MOZ_COUNT_CTOR(GetNodeIdCallback); }
+  virtual ~GetNodeIdCallback() { MOZ_COUNT_DTOR(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);
     }
 
-    MOZ_COUNTED_DTOR(nsKeyFrameIndex)
+    ~nsKeyFrameIndex() { MOZ_COUNT_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():
-  MOZ_COUNTED_DTOR(WebMBufferedState)
+  ~WebMBufferedState() { MOZ_COUNT_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);
   }
 
-  MOZ_COUNTED_DTOR(AudioSourcePullListener)
+  ~AudioSourcePullListener() { MOZ_COUNT_DTOR(AudioSourcePullListener); }
 
   void NotifyPull(MediaTrackGraph* aGraph, TrackTime aEndOfAppendedData,
                   TrackTime aDesiredTime) override;