Skip to content

Commit 59b2337

Browse files
committed
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
1 parent 6635003 commit 59b2337

File tree

137 files changed

+250
-430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+250
-430
lines changed

accessible/base/AccGroupInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace a11y {
1515
*/
1616
class AccGroupInfo {
1717
public:
18-
~AccGroupInfo() { MOZ_COUNT_DTOR(AccGroupInfo); }
18+
MOZ_COUNTED_DTOR(AccGroupInfo)
1919

2020
/**
2121
* Return 1-based position in the group.

accessible/generic/DocAccessible.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1828,7 +1828,7 @@ class InsertIterator final {
18281828
MOZ_ASSERT(aNodes, "No nodes to search for accessible elements");
18291829
MOZ_COUNT_CTOR(InsertIterator);
18301830
}
1831-
~InsertIterator() { MOZ_COUNT_DTOR(InsertIterator); }
1831+
MOZ_COUNTED_DTOR(InsertIterator)
18321832

18331833
Accessible* Context() const { return mWalker.Context(); }
18341834
Accessible* Child() const { return mChild; }

accessible/ipc/other/ProxyAccessible.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ProxyAccessible : public ProxyAccessibleBase<ProxyAccessible> {
2929
MOZ_COUNT_CTOR(ProxyAccessible);
3030
}
3131

32-
~ProxyAccessible() { MOZ_COUNT_DTOR(ProxyAccessible); }
32+
MOZ_COUNTED_DTOR(ProxyAccessible)
3333

3434
#include "mozilla/a11y/ProxyAccessibleShared.h"
3535

accessible/ipc/win/ProxyAccessible.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class ProxyAccessible : public ProxyAccessibleBase<ProxyAccessible> {
2828
MOZ_COUNT_CTOR(ProxyAccessible);
2929
}
3030

31-
~ProxyAccessible() { MOZ_COUNT_DTOR(ProxyAccessible); }
31+
MOZ_COUNTED_DTOR(ProxyAccessible)
3232

3333
#include "mozilla/a11y/ProxyAccessibleShared.h"
3434

dom/base/ChildIterator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ class MOZ_NEEDS_MEMMOVABLE_MEMBERS StyleChildrenIterator
303303
return *this;
304304
}
305305

306-
~StyleChildrenIterator() { MOZ_COUNT_DTOR(StyleChildrenIterator); }
306+
MOZ_COUNTED_DTOR(StyleChildrenIterator)
307307

308308
using AllChildrenIterator::GetNextChild;
309309
using AllChildrenIterator::GetPreviousChild;

dom/base/DirectionalityUtils.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -508,9 +508,7 @@ class nsTextNodeDirectionalityMap {
508508
aTextNode->SetHasTextNodeDirectionalityMap();
509509
}
510510

511-
~nsTextNodeDirectionalityMap() {
512-
MOZ_COUNT_DTOR(nsTextNodeDirectionalityMap);
513-
}
511+
MOZ_COUNTED_DTOR(nsTextNodeDirectionalityMap)
514512

515513
static void nsTextNodeDirectionalityMapPropertyDestructor(
516514
void* aObject, nsAtom* aProperty, void* aPropertyValue, void* aData) {

dom/base/Document.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12804,8 +12804,8 @@ class FullscreenRoots {
1280412804
static bool IsEmpty();
1280512805

1280612806
private:
12807-
FullscreenRoots() { MOZ_COUNT_CTOR(FullscreenRoots); }
12808-
~FullscreenRoots() { MOZ_COUNT_DTOR(FullscreenRoots); }
12807+
MOZ_COUNTED_DEFAULT_CTOR(FullscreenRoots)
12808+
MOZ_COUNTED_DTOR(FullscreenRoots)
1280912809

1281012810
enum { NotFound = uint32_t(-1) };
1281112811
// Looks in mRoots for aRoot. Returns the index if found, otherwise NotFound.

dom/base/Document.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1599,7 +1599,7 @@ class Document : public nsINode,
15991599

16001600
nsExpirationState* GetExpirationState() { return &mState; }
16011601

1602-
~SelectorCacheKey() { MOZ_COUNT_DTOR(SelectorCacheKey); }
1602+
MOZ_COUNTED_DTOR(SelectorCacheKey)
16031603
};
16041604

16051605
class SelectorCacheKeyDeleter;

dom/base/FullscreenChange.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class FullscreenRequest : public FullscreenChange {
8989
dom::CallerType::NonSystem, false));
9090
}
9191

92-
~FullscreenRequest() { MOZ_COUNT_DTOR(FullscreenRequest); }
92+
MOZ_COUNTED_DTOR(FullscreenRequest)
9393

9494
dom::Element* Element() const { return mElement; }
9595

@@ -149,7 +149,7 @@ class FullscreenExit : public FullscreenChange {
149149
return WrapUnique(new FullscreenExit(aDoc, nullptr));
150150
}
151151

152-
~FullscreenExit() { MOZ_COUNT_DTOR(FullscreenExit); }
152+
MOZ_COUNTED_DTOR(FullscreenExit)
153153

154154
private:
155155
FullscreenExit(dom::Document* aDoc, already_AddRefed<Promise> aPromise)

dom/base/nsContentUtils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8286,7 +8286,7 @@ class StringBuilder {
82868286
public:
82878287
StringBuilder() : mLast(this), mLength(0) { MOZ_COUNT_CTOR(StringBuilder); }
82888288

8289-
~StringBuilder() { MOZ_COUNT_DTOR(StringBuilder); }
8289+
MOZ_COUNTED_DTOR(StringBuilder)
82908290

82918291
void Append(nsAtom* aAtom) {
82928292
Unit* u = AddUnit();

dom/base/nsFrameMessageManager.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,7 @@ struct nsMessageManagerScriptHolder {
402402
MOZ_COUNT_CTOR(nsMessageManagerScriptHolder);
403403
}
404404

405-
~nsMessageManagerScriptHolder() {
406-
MOZ_COUNT_DTOR(nsMessageManagerScriptHolder);
407-
}
405+
MOZ_COUNTED_DTOR(nsMessageManagerScriptHolder)
408406

409407
JS::PersistentRooted<JSScript*> mScript;
410408
};
@@ -421,9 +419,7 @@ class nsMessageManagerScriptExecutor {
421419
nsMessageManagerScriptExecutor() {
422420
MOZ_COUNT_CTOR(nsMessageManagerScriptExecutor);
423421
}
424-
~nsMessageManagerScriptExecutor() {
425-
MOZ_COUNT_DTOR(nsMessageManagerScriptExecutor);
426-
}
422+
MOZ_COUNTED_DTOR(nsMessageManagerScriptExecutor)
427423

428424
void DidCreateScriptLoader();
429425
void LoadScriptInternal(JS::Handle<JSObject*> aMessageManager,

dom/bindings/NonRefcountedDOMObject.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ namespace dom {
2020
// the leak log too.
2121
class NonRefcountedDOMObject {
2222
protected:
23-
NonRefcountedDOMObject() { MOZ_COUNT_CTOR(NonRefcountedDOMObject); }
23+
MOZ_COUNTED_DEFAULT_CTOR(NonRefcountedDOMObject)
2424

25-
~NonRefcountedDOMObject() { MOZ_COUNT_DTOR(NonRefcountedDOMObject); }
25+
MOZ_COUNTED_DTOR(NonRefcountedDOMObject)
2626

2727
NonRefcountedDOMObject(const NonRefcountedDOMObject& aOther)
2828
: NonRefcountedDOMObject() {}

dom/canvas/TextMetrics.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class TextMetrics final : public NonRefcountedDOMObject {
3737
MOZ_COUNT_CTOR(TextMetrics);
3838
}
3939

40-
~TextMetrics() { MOZ_COUNT_DTOR(TextMetrics); }
40+
MOZ_COUNTED_DTOR(TextMetrics)
4141

4242
double Width() const { return width; }
4343

dom/encoding/TextDecoder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class TextDecoder final : public NonRefcountedDOMObject {
4040
MOZ_COUNT_CTOR(TextDecoder);
4141
}
4242

43-
~TextDecoder() { MOZ_COUNT_DTOR(TextDecoder); }
43+
MOZ_COUNTED_DTOR(TextDecoder)
4444

4545
bool WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto,
4646
JS::MutableHandle<JSObject*> aReflector) {

dom/events/EventDispatcher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class EventTargetChainItem {
135135
MOZ_COUNT_CTOR(EventTargetChainItem);
136136
}
137137

138-
~EventTargetChainItem() { MOZ_COUNT_DTOR(EventTargetChainItem); }
138+
MOZ_COUNTED_DTOR(EventTargetChainItem)
139139

140140
static EventTargetChainItem* Create(nsTArray<EventTargetChainItem>& aChain,
141141
EventTarget* aTarget,

dom/events/PointerEventHandler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class PointerCaptureInfo final {
2828
MOZ_COUNT_CTOR(PointerCaptureInfo);
2929
}
3030

31-
~PointerCaptureInfo() { MOZ_COUNT_DTOR(PointerCaptureInfo); }
31+
MOZ_COUNTED_DTOR(PointerCaptureInfo)
3232

3333
bool Empty() { return !(mPendingContent || mOverrideContent); }
3434
};

dom/html/HTMLFormSubmission.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class HTMLFormSubmission {
4545
NotNull<const Encoding*>& aEncoding,
4646
HTMLFormSubmission** aFormSubmission);
4747

48-
virtual ~HTMLFormSubmission() { MOZ_COUNT_DTOR(HTMLFormSubmission); }
48+
MOZ_COUNTED_DTOR_VIRTUAL(HTMLFormSubmission)
4949

5050
/**
5151
* Submit a name/value pair

dom/indexedDB/ActorsParent.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ struct IndexDataValue final {
532532
MOZ_COUNT_CTOR(IndexDataValue);
533533
}
534534

535-
~IndexDataValue() { MOZ_COUNT_DTOR(IndexDataValue); }
535+
MOZ_COUNTED_DTOR(IndexDataValue)
536536

537537
bool operator==(const IndexDataValue& aOther) const {
538538
if (mIndexId != aOther.mIndexId) {

dom/indexedDB/IDBObjectStore.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ struct IDBObjectStore::StructuredCloneWriteInfo {
114114
aCloneWriteInfo.mOffsetToKeyProp = 0;
115115
}
116116

117-
~StructuredCloneWriteInfo() { MOZ_COUNT_DTOR(StructuredCloneWriteInfo); }
117+
MOZ_COUNTED_DTOR(StructuredCloneWriteInfo)
118118
};
119119

120120
// Used by ValueWrapper::Clone to hold strong references to any blob-like
@@ -135,9 +135,9 @@ struct MOZ_STACK_CLASS MutableFileData final {
135135
nsString type;
136136
nsString name;
137137

138-
MutableFileData() { MOZ_COUNT_CTOR(MutableFileData); }
138+
MOZ_COUNTED_DEFAULT_CTOR(MutableFileData)
139139

140-
~MutableFileData() { MOZ_COUNT_DTOR(MutableFileData); }
140+
MOZ_COUNTED_DTOR(MutableFileData)
141141
};
142142

143143
struct MOZ_STACK_CLASS BlobOrFileData final {
@@ -151,7 +151,7 @@ struct MOZ_STACK_CLASS BlobOrFileData final {
151151
MOZ_COUNT_CTOR(BlobOrFileData);
152152
}
153153

154-
~BlobOrFileData() { MOZ_COUNT_DTOR(BlobOrFileData); }
154+
MOZ_COUNTED_DTOR(BlobOrFileData)
155155
};
156156

157157
struct MOZ_STACK_CLASS WasmModuleData final {
@@ -164,7 +164,7 @@ struct MOZ_STACK_CLASS WasmModuleData final {
164164
MOZ_COUNT_CTOR(WasmModuleData);
165165
}
166166

167-
~WasmModuleData() { MOZ_COUNT_DTOR(WasmModuleData); }
167+
MOZ_COUNTED_DTOR(WasmModuleData)
168168
};
169169

170170
struct MOZ_STACK_CLASS GetAddInfoClosure final {
@@ -177,7 +177,7 @@ struct MOZ_STACK_CLASS GetAddInfoClosure final {
177177
MOZ_COUNT_CTOR(GetAddInfoClosure);
178178
}
179179

180-
~GetAddInfoClosure() { MOZ_COUNT_DTOR(GetAddInfoClosure); }
180+
MOZ_COUNTED_DTOR(GetAddInfoClosure)
181181
};
182182

183183
RefPtr<IDBRequest> GenerateRequest(JSContext* aCx,

dom/indexedDB/IDBObjectStore.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class IDBObjectStore final : public nsISupports, public nsWrapperCache {
8888
MOZ_COUNT_CTOR(IDBObjectStore::ValueWrapper);
8989
}
9090

91-
~ValueWrapper() { MOZ_COUNT_DTOR(IDBObjectStore::ValueWrapper); }
91+
MOZ_COUNTED_DTOR_NESTED(ValueWrapper, IDBObjectStore::ValueWrapper)
9292

9393
const JS::Rooted<JS::Value>& Value() const { return mValue; }
9494

dom/indexedDB/KeyPath.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class KeyPath {
4242
*this = aOther;
4343
}
4444

45-
~KeyPath() { MOZ_COUNT_DTOR(KeyPath); }
45+
MOZ_COUNTED_DTOR(KeyPath)
4646

4747
static nsresult Parse(const nsAString& aString, KeyPath* aKeyPath);
4848

dom/ipc/ContentParent.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ namespace dom {
356356
// IPC receiver for remote GC/CC logging.
357357
class CycleCollectWithLogsParent final : public PCycleCollectWithLogsParent {
358358
public:
359-
~CycleCollectWithLogsParent() { MOZ_COUNT_DTOR(CycleCollectWithLogsParent); }
359+
MOZ_COUNTED_DTOR(CycleCollectWithLogsParent)
360360

361361
static bool AllocAndSendConstructor(ContentParent* aManager,
362362
bool aDumpAllTraces,

dom/ipc/ContentProcessManager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class ContentParent;
2020
class ContentProcessManager final {
2121
public:
2222
static ContentProcessManager* GetSingleton();
23-
~ContentProcessManager() { MOZ_COUNT_DTOR(ContentProcessManager); };
23+
MOZ_COUNTED_DTOR(ContentProcessManager);
2424

2525
/**
2626
* Add a new content process into the map.
@@ -83,7 +83,7 @@ class ContentProcessManager final {
8383
nsDataHashtable<nsUint64HashKey, ContentParent*> mContentParentMap;
8484
nsDataHashtable<nsUint64HashKey, BrowserParent*> mBrowserParentMap;
8585

86-
ContentProcessManager() { MOZ_COUNT_CTOR(ContentProcessManager); };
86+
MOZ_COUNTED_DEFAULT_CTOR(ContentProcessManager);
8787
};
8888

8989
} // namespace dom

dom/media/MediaFormatReader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ class MediaFormatReader::DemuxerProxy {
453453
MOZ_COUNT_CTOR(DemuxerProxy);
454454
}
455455

456-
~DemuxerProxy() { MOZ_COUNT_DTOR(DemuxerProxy); }
456+
MOZ_COUNTED_DTOR(DemuxerProxy)
457457

458458
RefPtr<ShutdownPromise> Shutdown() {
459459
RefPtr<Data> data = std::move(mData);

dom/media/MediaInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class TrackInfo {
102102

103103
virtual UniquePtr<TrackInfo> Clone() const = 0;
104104

105-
virtual ~TrackInfo() { MOZ_COUNT_DTOR(TrackInfo); }
105+
MOZ_COUNTED_DTOR_VIRTUAL(TrackInfo)
106106

107107
protected:
108108
TrackInfo(const TrackInfo& aOther) {

dom/media/MediaSegment.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class MediaSegment {
9999
MediaSegment(const MediaSegment&) = delete;
100100
MediaSegment& operator=(const MediaSegment&) = delete;
101101

102-
virtual ~MediaSegment() { MOZ_COUNT_DTOR(MediaSegment); }
102+
MOZ_COUNTED_DTOR_VIRTUAL(MediaSegment)
103103

104104
enum Type { AUDIO, VIDEO, TYPE_COUNT };
105105

dom/media/MediaTrackGraph.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ class MediaInputPort final {
788788
}
789789

790790
// Private destructor, to discourage deletion outside of Release():
791-
~MediaInputPort() { MOZ_COUNT_DTOR(MediaInputPort); }
791+
MOZ_COUNTED_DTOR(MediaInputPort)
792792

793793
public:
794794
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaInputPort)
@@ -1134,7 +1134,7 @@ class MediaTrackGraph {
11341134
explicit MediaTrackGraph(TrackRate aSampleRate) : mSampleRate(aSampleRate) {
11351135
MOZ_COUNT_CTOR(MediaTrackGraph);
11361136
}
1137-
virtual ~MediaTrackGraph() { MOZ_COUNT_DTOR(MediaTrackGraph); }
1137+
MOZ_COUNTED_DTOR_VIRTUAL(MediaTrackGraph)
11381138

11391139
// Intended only for assertions, either on graph thread or not running (in
11401140
// which case we must be on the main thread).

dom/media/MediaTrackGraphImpl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class ControlMessage {
5555
MOZ_COUNT_CTOR(ControlMessage);
5656
}
5757
// All these run on the graph thread
58-
virtual ~ControlMessage() { MOZ_COUNT_DTOR(ControlMessage); }
58+
MOZ_COUNTED_DTOR_VIRTUAL(ControlMessage)
5959
// Do the action of this message on the MediaTrackGraph thread. Any actions
6060
// affecting graph processing should take effect at mProcessedTime.
6161
// All track data for times < mProcessedTime has already been

dom/media/VideoFrameConverter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ class VideoFrameConverter {
214214
}
215215
};
216216

217-
virtual ~VideoFrameConverter() { MOZ_COUNT_DTOR(VideoFrameConverter); }
217+
MOZ_COUNTED_DTOR_VIRTUAL(VideoFrameConverter)
218218

219219
static void SameFrameTick(nsITimer* aTimer, void* aClosure) {
220220
MOZ_ASSERT(aClosure);

dom/media/gmp/GMPTimerParent.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class GMPTimerParent : public PGMPTimerParent {
3737

3838
struct Context {
3939
Context() : mId(0) { MOZ_COUNT_CTOR(Context); }
40-
~Context() { MOZ_COUNT_DTOR(Context); }
40+
MOZ_COUNTED_DTOR(Context)
4141
nsCOMPtr<nsITimer> mTimer;
4242
RefPtr<GMPTimerParent>
4343
mParent; // Note: live timers keep the GMPTimerParent alive.

dom/media/gmp/mozIGeckoMediaPluginService.idl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ typedef GMPVideoGetterCallback<GMPVideoEncoderProxy> GetGMPVideoEncoderCallback;
4141
class GetNodeIdCallback
4242
{
4343
public:
44-
GetNodeIdCallback() { MOZ_COUNT_CTOR(GetNodeIdCallback); }
45-
virtual ~GetNodeIdCallback() { MOZ_COUNT_DTOR(GetNodeIdCallback); }
44+
MOZ_COUNTED_DEFAULT_CTOR(GetNodeIdCallback)
45+
MOZ_COUNTED_DTOR_VIRTUAL(GetNodeIdCallback)
4646
virtual void Done(nsresult aResult, const nsACString& aNodeId) = 0;
4747
};
4848
%}

dom/media/ogg/OggCodecState.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ class SkeletonState : public OggCodecState {
546546
MOZ_COUNT_CTOR(nsKeyFrameIndex);
547547
}
548548

549-
~nsKeyFrameIndex() { MOZ_COUNT_DTOR(nsKeyFrameIndex); }
549+
MOZ_COUNTED_DTOR(nsKeyFrameIndex)
550550

551551
void Add(int64_t aOffset, int64_t aTimeMs) {
552552
mKeyPoints.AppendElement(nsKeyPoint(aOffset, aTimeMs));

dom/media/webm/WebMBufferedParser.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ class WebMBufferedState final {
295295

296296
private:
297297
// Private destructor, to discourage deletion outside of Release():
298-
~WebMBufferedState() { MOZ_COUNT_DTOR(WebMBufferedState); }
298+
MOZ_COUNTED_DTOR(WebMBufferedState)
299299

300300
// Synchronizes access to the mTimeMapping array and mLastBlockOffset.
301301
ReentrantMonitor mReentrantMonitor;

dom/media/webrtc/MediaEngineDefault.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ class AudioSourcePullListener : public MediaTrackListener {
364364
MOZ_COUNT_CTOR(AudioSourcePullListener);
365365
}
366366

367-
~AudioSourcePullListener() { MOZ_COUNT_DTOR(AudioSourcePullListener); }
367+
MOZ_COUNTED_DTOR(AudioSourcePullListener)
368368

369369
void NotifyPull(MediaTrackGraph* aGraph, TrackTime aEndOfAppendedData,
370370
TrackTime aDesiredTime) override;

0 commit comments

Comments
 (0)