From 7bc855bb7cb18b23b370944becc8b20aa859c999 Mon Sep 17 00:00:00 2001 From: roytam1 Date: Mon, 20 Jan 2025 23:04:04 +0800 Subject: [PATCH] ported from UXP: Issue #2678 - Remove NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED (139e7a7a) --- accessible/generic/DocAccessible.cpp | 2 +- accessible/xul/XULTreeAccessible.cpp | 4 ++-- accessible/xul/XULTreeGridAccessible.cpp | 4 ++-- dom/abort/AbortSignal.cpp | 2 +- dom/animation/Animation.cpp | 2 +- dom/animation/DocumentTimeline.cpp | 2 +- dom/animation/KeyframeEffectReadOnly.cpp | 2 +- dom/archivereader/ArchiveRequest.cpp | 2 +- dom/base/DOMCursor.cpp | 2 +- dom/base/DOMRequest.cpp | 2 +- dom/base/EventSource.cpp | 2 +- dom/base/ScreenOrientation.cpp | 2 +- dom/base/ShadowRoot.cpp | 2 +- dom/base/WebSocket.cpp | 2 +- dom/base/nsContentIterator.cpp | 2 +- dom/base/nsContentList.cpp | 2 +- dom/base/nsDOMDataChannel.cpp | 2 +- dom/base/nsGlobalWindow.cpp | 2 +- dom/base/nsInProcessTabChildGlobal.cpp | 2 +- dom/base/nsScreen.cpp | 2 +- dom/bindings/Codegen.py | 4 ++-- dom/broadcastchannel/BroadcastChannel.cpp | 2 +- dom/browser-element/BrowserElementAudioChannel.cpp | 2 +- dom/canvas/OffscreenCanvas.cpp | 2 +- dom/events/CustomEvent.cpp | 2 +- dom/events/DataContainerEvent.cpp | 2 +- dom/events/DeviceMotionEvent.cpp | 2 +- dom/events/MessageEvent.cpp | 2 +- dom/events/StorageEvent.cpp | 2 +- dom/events/TouchEvent.cpp | 2 +- dom/events/UIEvent.cpp | 2 +- dom/events/XULCommandEvent.cpp | 2 +- dom/fetch/FetchObserver.cpp | 2 +- dom/file/FileReader.cpp | 2 +- dom/filesystem/compat/FileSystemDirectoryEntry.cpp | 2 +- dom/filesystem/compat/FileSystemFileEntry.cpp | 2 +- .../compat/FileSystemRootDirectoryEntry.cpp | 2 +- .../compat/FileSystemRootDirectoryReader.cpp | 2 +- dom/flyweb/FlyWebServerEvents.cpp | 2 +- dom/gamepad/GamepadServiceTest.cpp | 2 +- dom/html/HTMLCanvasElement.cpp | 2 +- dom/html/HTMLDataListElement.cpp | 2 +- dom/html/HTMLMediaElement.cpp | 8 ++++---- dom/html/HTMLSourceElement.cpp | 2 +- dom/html/HTMLTableElement.cpp | 2 +- dom/html/HTMLTableRowElement.cpp | 2 +- dom/html/HTMLTableSectionElement.cpp | 2 +- dom/html/HTMLTemplateElement.cpp | 2 +- dom/html/HTMLTrackElement.cpp | 2 +- dom/indexedDB/IDBDatabase.cpp | 2 +- dom/indexedDB/IDBFileHandle.cpp | 2 +- dom/indexedDB/IDBFileRequest.cpp | 2 +- dom/indexedDB/IDBMutableFile.cpp | 2 +- dom/indexedDB/IDBRequest.cpp | 4 ++-- dom/indexedDB/IDBTransaction.cpp | 2 +- dom/indexedDB/IDBWrapperCache.cpp | 2 +- dom/ipc/TabChild.cpp | 4 ++-- dom/media/CanvasCaptureMediaStream.cpp | 2 +- dom/media/DOMMediaStream.cpp | 8 ++++---- dom/media/MediaManager.cpp | 2 +- dom/media/MediaRecorder.cpp | 2 +- dom/media/MediaStreamTrack.cpp | 2 +- dom/media/MediaTrack.cpp | 2 +- dom/media/MediaTrackList.cpp | 2 +- dom/media/TextTrack.cpp | 2 +- dom/media/TextTrackCue.cpp | 2 +- dom/media/TextTrackList.cpp | 2 +- dom/media/VideoTrack.cpp | 2 +- dom/media/eme/MediaEncryptedEvent.cpp | 2 +- dom/media/eme/MediaKeyMessageEvent.cpp | 2 +- dom/media/eme/MediaKeySession.cpp | 2 +- dom/media/imagecapture/ImageCapture.cpp | 2 +- dom/media/mediasource/MediaSource.cpp | 2 +- dom/media/mediasource/SourceBuffer.cpp | 2 +- dom/media/mediasource/SourceBufferList.cpp | 2 +- dom/media/webaudio/AudioBufferSourceNode.cpp | 2 +- dom/media/webaudio/AudioContext.cpp | 2 +- dom/media/webaudio/AudioDestinationNode.cpp | 2 +- dom/media/webaudio/AudioNode.cpp | 2 +- dom/media/webaudio/AudioProcessingEvent.cpp | 2 +- dom/media/webaudio/BiquadFilterNode.cpp | 2 +- dom/media/webaudio/ConstantSourceNode.cpp | 2 +- dom/media/webaudio/ConvolverNode.cpp | 2 +- dom/media/webaudio/DelayNode.cpp | 2 +- dom/media/webaudio/DynamicsCompressorNode.cpp | 2 +- dom/media/webaudio/GainNode.cpp | 2 +- .../webaudio/MediaStreamAudioDestinationNode.cpp | 4 ++-- dom/media/webaudio/MediaStreamAudioSourceNode.cpp | 2 +- dom/media/webaudio/OscillatorNode.cpp | 2 +- dom/media/webaudio/PannerNode.cpp | 2 +- dom/media/webaudio/StereoPannerNode.cpp | 2 +- dom/media/webaudio/WaveShaperNode.cpp | 2 +- .../webspeech/recognition/SpeechRecognition.cpp | 2 +- dom/media/webspeech/synth/SpeechSynthesis.cpp | 2 +- .../webspeech/synth/SpeechSynthesisUtterance.cpp | 2 +- dom/messagechannel/MessagePort.cpp | 2 +- dom/network/TCPServerSocket.cpp | 2 +- dom/network/TCPSocket.cpp | 2 +- dom/network/UDPSocket.cpp | 2 +- dom/notification/Notification.cpp | 2 +- dom/notification/NotificationEvent.cpp | 2 +- dom/offline/nsDOMOfflineResourceList.cpp | 2 +- dom/performance/Performance.cpp | 2 +- dom/performance/PerformanceResourceTiming.cpp | 2 +- dom/presentation/PresentationAvailability.cpp | 2 +- dom/presentation/PresentationConnection.cpp | 2 +- dom/presentation/PresentationConnectionList.cpp | 2 +- dom/presentation/PresentationRequest.cpp | 2 +- dom/quota/QuotaRequests.cpp | 4 ++-- dom/script/ModuleLoadRequest.cpp | 2 +- dom/smil/TimeEvent.cpp | 2 +- dom/svg/SVGSwitchElement.cpp | 2 +- dom/vr/VRDisplay.cpp | 2 +- dom/workers/ServiceWorker.cpp | 2 +- dom/workers/ServiceWorkerContainer.cpp | 2 +- dom/workers/ServiceWorkerEvents.cpp | 8 ++++---- dom/workers/ServiceWorkerRegistration.cpp | 6 +++--- dom/workers/SharedWorker.cpp | 2 +- dom/workers/WorkerPrivate.cpp | 2 +- dom/workers/WorkerScope.cpp | 2 +- dom/xhr/XMLHttpRequestEventTarget.cpp | 2 +- dom/xhr/XMLHttpRequestMainThread.cpp | 2 +- dom/xhr/XMLHttpRequestWorker.cpp | 2 +- dom/xml/nsXMLContentSink.cpp | 2 +- dom/xml/nsXMLFragmentContentSink.cpp | 2 +- dom/xul/templates/nsXULTreeBuilder.cpp | 2 +- editor/libeditor/HTMLEditor.cpp | 2 +- editor/libeditor/TextEditor.cpp | 2 +- layout/style/CSSStyleSheet.cpp | 2 +- layout/style/FontFaceSet.cpp | 2 +- layout/style/MediaQueryList.cpp | 2 +- layout/style/StyleRule.cpp | 2 +- layout/style/nsCSSRules.cpp | 14 +++++++------- layout/xul/tree/TreeBoxObject.cpp | 2 +- parser/html/nsHtml5DocumentBuilder.cpp | 2 +- toolkit/components/places/nsNavHistoryResult.cpp | 2 +- xpcom/glue/nsCycleCollectionParticipant.h | 3 --- 137 files changed, 160 insertions(+), 163 deletions(-) diff --git a/accessible/generic/DocAccessible.cpp b/accessible/generic/DocAccessible.cpp index a81ae1d23..82dc1bb4e 100644 --- a/accessible/generic/DocAccessible.cpp +++ b/accessible/generic/DocAccessible.cpp @@ -161,7 +161,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(DocAccessible, Accessible) tmp->mARIAOwnsHash.Clear(); NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DocAccessible) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DocAccessible) NS_INTERFACE_MAP_ENTRY(nsIDocumentObserver) NS_INTERFACE_MAP_ENTRY(nsIMutationObserver) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) diff --git a/accessible/xul/XULTreeAccessible.cpp b/accessible/xul/XULTreeAccessible.cpp index fc7d19e99..9ef4fe09b 100644 --- a/accessible/xul/XULTreeAccessible.cpp +++ b/accessible/xul/XULTreeAccessible.cpp @@ -74,7 +74,7 @@ XULTreeAccessible::~XULTreeAccessible() NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeAccessible, Accessible, mTree, mAccessibleCache) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(XULTreeAccessible) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(XULTreeAccessible) NS_INTERFACE_MAP_END_INHERITING(Accessible) NS_IMPL_ADDREF_INHERITED(XULTreeAccessible, Accessible) @@ -1086,7 +1086,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeItemAccessible, XULTreeItemAccessibleBase, mColumn) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(XULTreeItemAccessible) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(XULTreeItemAccessible) NS_INTERFACE_MAP_END_INHERITING(XULTreeItemAccessibleBase) NS_IMPL_ADDREF_INHERITED(XULTreeItemAccessible, XULTreeItemAccessibleBase) NS_IMPL_RELEASE_INHERITED(XULTreeItemAccessible, XULTreeItemAccessibleBase) diff --git a/accessible/xul/XULTreeGridAccessible.cpp b/accessible/xul/XULTreeGridAccessible.cpp index e9e3a0e8f..8c645231d 100644 --- a/accessible/xul/XULTreeGridAccessible.cpp +++ b/accessible/xul/XULTreeGridAccessible.cpp @@ -263,7 +263,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeGridRowAccessible, XULTreeItemAccessibleBase, mAccessibleCache) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(XULTreeGridRowAccessible) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(XULTreeGridRowAccessible) NS_INTERFACE_MAP_END_INHERITING(XULTreeItemAccessibleBase) NS_IMPL_ADDREF_INHERITED(XULTreeGridRowAccessible, @@ -447,7 +447,7 @@ XULTreeGridCellAccessible::~XULTreeGridCellAccessible() NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeGridCellAccessible, LeafAccessible, mTree, mColumn) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(XULTreeGridCellAccessible) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(XULTreeGridCellAccessible) NS_INTERFACE_MAP_END_INHERITING(LeafAccessible) NS_IMPL_ADDREF_INHERITED(XULTreeGridCellAccessible, LeafAccessible) NS_IMPL_RELEASE_INHERITED(XULTreeGridCellAccessible, LeafAccessible) diff --git a/dom/abort/AbortSignal.cpp b/dom/abort/AbortSignal.cpp index dfe35c13e..0ca91019f 100644 --- a/dom/abort/AbortSignal.cpp +++ b/dom/abort/AbortSignal.cpp @@ -22,7 +22,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(AbortSignal, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(AbortSignal) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AbortSignal) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(AbortSignal, DOMEventTargetHelper) diff --git a/dom/animation/Animation.cpp b/dom/animation/Animation.cpp index 6841b67c6..86c4485c8 100644 --- a/dom/animation/Animation.cpp +++ b/dom/animation/Animation.cpp @@ -36,7 +36,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(Animation, DOMEventTargetHelper, NS_IMPL_ADDREF_INHERITED(Animation, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(Animation, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(Animation) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Animation) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) JSObject* diff --git a/dom/animation/DocumentTimeline.cpp b/dom/animation/DocumentTimeline.cpp index 40c75ff8b..42002175a 100644 --- a/dom/animation/DocumentTimeline.cpp +++ b/dom/animation/DocumentTimeline.cpp @@ -35,7 +35,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(DocumentTimeline, AnimationTimeline) NS_IMPL_CYCLE_COLLECTION_TRACE_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DocumentTimeline) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DocumentTimeline) NS_INTERFACE_MAP_END_INHERITING(AnimationTimeline) NS_IMPL_ADDREF_INHERITED(DocumentTimeline, AnimationTimeline) diff --git a/dom/animation/KeyframeEffectReadOnly.cpp b/dom/animation/KeyframeEffectReadOnly.cpp index e5e5ac68e..59526b9aa 100644 --- a/dom/animation/KeyframeEffectReadOnly.cpp +++ b/dom/animation/KeyframeEffectReadOnly.cpp @@ -44,7 +44,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(KeyframeEffectReadOnly, AnimationEffectReadOnly) NS_IMPL_CYCLE_COLLECTION_TRACE_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(KeyframeEffectReadOnly) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(KeyframeEffectReadOnly) NS_INTERFACE_MAP_END_INHERITING(AnimationEffectReadOnly) NS_IMPL_ADDREF_INHERITED(KeyframeEffectReadOnly, AnimationEffectReadOnly) diff --git a/dom/archivereader/ArchiveRequest.cpp b/dom/archivereader/ArchiveRequest.cpp index 152e19923..23864b503 100644 --- a/dom/archivereader/ArchiveRequest.cpp +++ b/dom/archivereader/ArchiveRequest.cpp @@ -265,7 +265,7 @@ ArchiveRequest::Create(nsPIDOMWindowInner* aOwner, NS_IMPL_CYCLE_COLLECTION_INHERITED(ArchiveRequest, DOMRequest, mArchiveReader) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ArchiveRequest) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ArchiveRequest) NS_INTERFACE_MAP_END_INHERITING(DOMRequest) NS_IMPL_ADDREF_INHERITED(ArchiveRequest, DOMRequest) diff --git a/dom/base/DOMCursor.cpp b/dom/base/DOMCursor.cpp index 1f92ac9cc..a86f1860e 100644 --- a/dom/base/DOMCursor.cpp +++ b/dom/base/DOMCursor.cpp @@ -13,7 +13,7 @@ namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(DOMCursor, DOMRequest, mCallback) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DOMCursor) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMCursor) NS_INTERFACE_MAP_ENTRY(nsIDOMDOMCursor) NS_INTERFACE_MAP_END_INHERITING(DOMRequest) diff --git a/dom/base/DOMRequest.cpp b/dom/base/DOMRequest.cpp index ce6cd1dcd..7faf624f6 100644 --- a/dom/base/DOMRequest.cpp +++ b/dom/base/DOMRequest.cpp @@ -67,7 +67,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(DOMRequest, NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mResult) NS_IMPL_CYCLE_COLLECTION_TRACE_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DOMRequest) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMRequest) NS_INTERFACE_MAP_ENTRY(nsIDOMDOMRequest) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/base/EventSource.cpp b/dom/base/EventSource.cpp index 5106eca78..84a84f964 100644 --- a/dom/base/EventSource.cpp +++ b/dom/base/EventSource.cpp @@ -2113,7 +2113,7 @@ EventSource::IsCertainlyAliveForCC() const return mKeepingAlive; } -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(EventSource) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(EventSource) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(EventSource, DOMEventTargetHelper) diff --git a/dom/base/ScreenOrientation.cpp b/dom/base/ScreenOrientation.cpp index 644e5145d..7d9dd94c5 100644 --- a/dom/base/ScreenOrientation.cpp +++ b/dom/base/ScreenOrientation.cpp @@ -24,7 +24,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(ScreenOrientation, DOMEventTargetHelper, mScreen); -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ScreenOrientation) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ScreenOrientation) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(ScreenOrientation, DOMEventTargetHelper) diff --git a/dom/base/ShadowRoot.cpp b/dom/base/ShadowRoot.cpp index cc0423f1b..5adeabe34 100644 --- a/dom/base/ShadowRoot.cpp +++ b/dom/base/ShadowRoot.cpp @@ -47,7 +47,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(ShadowRoot) tmp->mIdentifierMap.Clear(); NS_IMPL_CYCLE_COLLECTION_UNLINK_END_INHERITED(DocumentFragment) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ShadowRoot) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ShadowRoot) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIContent) NS_INTERFACE_MAP_ENTRY(nsIMutationObserver) NS_INTERFACE_MAP_END_INHERITING(DocumentFragment) diff --git a/dom/base/WebSocket.cpp b/dom/base/WebSocket.cpp index 92de496b6..35f5ef676 100644 --- a/dom/base/WebSocket.cpp +++ b/dom/base/WebSocket.cpp @@ -1452,7 +1452,7 @@ WebSocket::IsCertainlyAliveForCC() const return mKeepingAlive; } -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(WebSocket) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(WebSocket) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(WebSocket, DOMEventTargetHelper) diff --git a/dom/base/nsContentIterator.cpp b/dom/base/nsContentIterator.cpp index 287de7722..36d12980a 100644 --- a/dom/base/nsContentIterator.cpp +++ b/dom/base/nsContentIterator.cpp @@ -1234,7 +1234,7 @@ protected: NS_IMPL_ADDREF_INHERITED(nsContentSubtreeIterator, nsContentIterator) NS_IMPL_RELEASE_INHERITED(nsContentSubtreeIterator, nsContentIterator) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsContentSubtreeIterator) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsContentSubtreeIterator) NS_INTERFACE_MAP_END_INHERITING(nsContentIterator) NS_IMPL_CYCLE_COLLECTION_INHERITED(nsContentSubtreeIterator, nsContentIterator, diff --git a/dom/base/nsContentList.cpp b/dom/base/nsContentList.cpp index 9408bbf00..a0a07721d 100644 --- a/dom/base/nsContentList.cpp +++ b/dom/base/nsContentList.cpp @@ -138,7 +138,7 @@ nsBaseContentList::IndexOf(nsIContent* aContent) NS_IMPL_CYCLE_COLLECTION_INHERITED(nsSimpleContentList, nsBaseContentList, mRoot) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsSimpleContentList) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSimpleContentList) NS_INTERFACE_MAP_END_INHERITING(nsBaseContentList) diff --git a/dom/base/nsDOMDataChannel.cpp b/dom/base/nsDOMDataChannel.cpp index dac3e0448..10b3e46bc 100644 --- a/dom/base/nsDOMDataChannel.cpp +++ b/dom/base/nsDOMDataChannel.cpp @@ -68,7 +68,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_ADDREF_INHERITED(nsDOMDataChannel, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(nsDOMDataChannel, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMDataChannel) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMDataChannel) NS_INTERFACE_MAP_ENTRY(nsIDOMDataChannel) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index 6989a4e4e..e5f0744c2 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -13431,7 +13431,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsGlobalChromeWindow, NS_IMPL_CYCLE_COLLECTION_UNLINK_END // QueryInterface implementation for nsGlobalChromeWindow -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsGlobalChromeWindow) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGlobalChromeWindow) NS_INTERFACE_MAP_ENTRY(nsIDOMChromeWindow) NS_INTERFACE_MAP_END_INHERITING(nsGlobalWindow) diff --git a/dom/base/nsInProcessTabChildGlobal.cpp b/dom/base/nsInProcessTabChildGlobal.cpp index 4702ea8a5..dc775ef19 100644 --- a/dom/base/nsInProcessTabChildGlobal.cpp +++ b/dom/base/nsInProcessTabChildGlobal.cpp @@ -160,7 +160,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsInProcessTabChildGlobal, tmp->UnlinkHostObjectURIs(); NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsInProcessTabChildGlobal) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsInProcessTabChildGlobal) NS_INTERFACE_MAP_ENTRY(nsIMessageListenerManager) NS_INTERFACE_MAP_ENTRY(nsIMessageSender) NS_INTERFACE_MAP_ENTRY(nsISyncMessageSender) diff --git a/dom/base/nsScreen.cpp b/dom/base/nsScreen.cpp index e744fcc2a..fce323408 100644 --- a/dom/base/nsScreen.cpp +++ b/dom/base/nsScreen.cpp @@ -50,7 +50,7 @@ nsScreen::~nsScreen() // QueryInterface implementation for nsScreen -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsScreen) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsScreen) NS_INTERFACE_MAP_ENTRY(nsIDOMScreen) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py index 6589b950e..45d503dac 100644 --- a/dom/bindings/Codegen.py +++ b/dom/bindings/Codegen.py @@ -15181,7 +15181,7 @@ class CGJSImplClass(CGBindingImplClass): NS_IMPL_CYCLE_COLLECTION_INHERITED(${ifaceName}, ${parentClass}, mImpl, mParent) NS_IMPL_ADDREF_INHERITED(${ifaceName}, ${parentClass}) NS_IMPL_RELEASE_INHERITED(${ifaceName}, ${parentClass}) - NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(${ifaceName}) + NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(${ifaceName}) NS_INTERFACE_MAP_END_INHERITING(${parentClass}) """, ifaceName=self.descriptor.name, @@ -17467,7 +17467,7 @@ class CGEventClass(CGBindingImplClass): $*{unlink} NS_IMPL_CYCLE_COLLECTION_UNLINK_END - NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(${nativeType}) + NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(${nativeType}) NS_INTERFACE_MAP_END_INHERITING(${parentType}) ${nativeType}::${nativeType}(mozilla::dom::EventTarget* aOwner) diff --git a/dom/broadcastchannel/BroadcastChannel.cpp b/dom/broadcastchannel/BroadcastChannel.cpp index cf0919624..b91f5b5a3 100644 --- a/dom/broadcastchannel/BroadcastChannel.cpp +++ b/dom/broadcastchannel/BroadcastChannel.cpp @@ -638,7 +638,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(BroadcastChannel, tmp->Shutdown(); NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(BroadcastChannel) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(BroadcastChannel) NS_INTERFACE_MAP_ENTRY(nsIIPCBackgroundChildCreateCallback) NS_INTERFACE_MAP_ENTRY(nsIObserver) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/browser-element/BrowserElementAudioChannel.cpp b/dom/browser-element/BrowserElementAudioChannel.cpp index fc013f9ac..d317ace49 100644 --- a/dom/browser-element/BrowserElementAudioChannel.cpp +++ b/dom/browser-element/BrowserElementAudioChannel.cpp @@ -27,7 +27,7 @@ namespace dom { NS_IMPL_ADDREF_INHERITED(BrowserElementAudioChannel, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(BrowserElementAudioChannel, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(BrowserElementAudioChannel) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(BrowserElementAudioChannel) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsIObserver) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/canvas/OffscreenCanvas.cpp b/dom/canvas/OffscreenCanvas.cpp index 0d188c24e..5d03d63bc 100644 --- a/dom/canvas/OffscreenCanvas.cpp +++ b/dom/canvas/OffscreenCanvas.cpp @@ -363,7 +363,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(OffscreenCanvas, DOMEventTargetHelper, mCurre NS_IMPL_ADDREF_INHERITED(OffscreenCanvas, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(OffscreenCanvas, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(OffscreenCanvas) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(OffscreenCanvas) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/events/CustomEvent.cpp b/dom/events/CustomEvent.cpp index 3b3fb3fdd..c918b4163 100644 --- a/dom/events/CustomEvent.cpp +++ b/dom/events/CustomEvent.cpp @@ -44,7 +44,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_END NS_IMPL_ADDREF_INHERITED(CustomEvent, Event) NS_IMPL_RELEASE_INHERITED(CustomEvent, Event) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(CustomEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CustomEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMCustomEvent) NS_INTERFACE_MAP_END_INHERITING(Event) diff --git a/dom/events/DataContainerEvent.cpp b/dom/events/DataContainerEvent.cpp index 0f9d41924..3584dc5e8 100644 --- a/dom/events/DataContainerEvent.cpp +++ b/dom/events/DataContainerEvent.cpp @@ -37,7 +37,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_ADDREF_INHERITED(DataContainerEvent, Event) NS_IMPL_RELEASE_INHERITED(DataContainerEvent, Event) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DataContainerEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DataContainerEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMDataContainerEvent) NS_INTERFACE_MAP_END_INHERITING(Event) diff --git a/dom/events/DeviceMotionEvent.cpp b/dom/events/DeviceMotionEvent.cpp index f8729c18d..440fa82e5 100644 --- a/dom/events/DeviceMotionEvent.cpp +++ b/dom/events/DeviceMotionEvent.cpp @@ -22,7 +22,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(DeviceMotionEvent, Event, NS_IMPL_ADDREF_INHERITED(DeviceMotionEvent, Event) NS_IMPL_RELEASE_INHERITED(DeviceMotionEvent, Event) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DeviceMotionEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DeviceMotionEvent) NS_INTERFACE_MAP_END_INHERITING(Event) void diff --git a/dom/events/MessageEvent.cpp b/dom/events/MessageEvent.cpp index 565cd0cd7..161516cc2 100644 --- a/dom/events/MessageEvent.cpp +++ b/dom/events/MessageEvent.cpp @@ -35,7 +35,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(MessageEvent, Event) NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mData) NS_IMPL_CYCLE_COLLECTION_TRACE_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MessageEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MessageEvent) NS_INTERFACE_MAP_END_INHERITING(Event) NS_IMPL_ADDREF_INHERITED(MessageEvent, Event) diff --git a/dom/events/StorageEvent.cpp b/dom/events/StorageEvent.cpp index 0b6f75634..2c79d12b8 100644 --- a/dom/events/StorageEvent.cpp +++ b/dom/events/StorageEvent.cpp @@ -26,7 +26,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(StorageEvent, Event) NS_IMPL_CYCLE_COLLECTION_UNLINK(mStorageArea) NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(StorageEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(StorageEvent) NS_INTERFACE_MAP_END_INHERITING(Event) StorageEvent::StorageEvent(EventTarget* aOwner) diff --git a/dom/events/TouchEvent.cpp b/dom/events/TouchEvent.cpp index 639406d12..339a3801b 100644 --- a/dom/events/TouchEvent.cpp +++ b/dom/events/TouchEvent.cpp @@ -74,7 +74,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(TouchEvent, UIEvent, mTargetTouches, mChangedTouches) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TouchEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TouchEvent) NS_INTERFACE_MAP_END_INHERITING(UIEvent) NS_IMPL_ADDREF_INHERITED(TouchEvent, UIEvent) diff --git a/dom/events/UIEvent.cpp b/dom/events/UIEvent.cpp index 22a4d5db3..aaab4561b 100644 --- a/dom/events/UIEvent.cpp +++ b/dom/events/UIEvent.cpp @@ -100,7 +100,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(UIEvent, Event, NS_IMPL_ADDREF_INHERITED(UIEvent, Event) NS_IMPL_RELEASE_INHERITED(UIEvent, Event) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(UIEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(UIEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMUIEvent) NS_INTERFACE_MAP_END_INHERITING(Event) diff --git a/dom/events/XULCommandEvent.cpp b/dom/events/XULCommandEvent.cpp index 770f37688..cd99473b4 100644 --- a/dom/events/XULCommandEvent.cpp +++ b/dom/events/XULCommandEvent.cpp @@ -32,7 +32,7 @@ NS_IMPL_RELEASE_INHERITED(XULCommandEvent, UIEvent) NS_IMPL_CYCLE_COLLECTION_INHERITED(XULCommandEvent, UIEvent, mSourceEvent) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(XULCommandEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(XULCommandEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMXULCommandEvent) NS_INTERFACE_MAP_END_INHERITING(UIEvent) diff --git a/dom/fetch/FetchObserver.cpp b/dom/fetch/FetchObserver.cpp index 93d93773f..0efee4295 100644 --- a/dom/fetch/FetchObserver.cpp +++ b/dom/fetch/FetchObserver.cpp @@ -21,7 +21,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(FetchObserver, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(FetchObserver) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FetchObserver) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(FetchObserver, DOMEventTargetHelper) diff --git a/dom/file/FileReader.cpp b/dom/file/FileReader.cpp index 6a2e4da18..d90f28274 100644 --- a/dom/file/FileReader.cpp +++ b/dom/file/FileReader.cpp @@ -68,7 +68,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(FileReader, NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mResultArrayBuffer) NS_IMPL_CYCLE_COLLECTION_TRACE_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(FileReader) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FileReader) NS_INTERFACE_MAP_ENTRY(nsITimerCallback) NS_INTERFACE_MAP_ENTRY(nsIInputStreamCallback) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) diff --git a/dom/filesystem/compat/FileSystemDirectoryEntry.cpp b/dom/filesystem/compat/FileSystemDirectoryEntry.cpp index 3157ef654..5e65136e8 100644 --- a/dom/filesystem/compat/FileSystemDirectoryEntry.cpp +++ b/dom/filesystem/compat/FileSystemDirectoryEntry.cpp @@ -20,7 +20,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(FileSystemDirectoryEntry, FileSystemEntry, NS_IMPL_ADDREF_INHERITED(FileSystemDirectoryEntry, FileSystemEntry) NS_IMPL_RELEASE_INHERITED(FileSystemDirectoryEntry, FileSystemEntry) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(FileSystemDirectoryEntry) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FileSystemDirectoryEntry) NS_INTERFACE_MAP_END_INHERITING(FileSystemEntry) FileSystemDirectoryEntry::FileSystemDirectoryEntry(nsIGlobalObject* aGlobal, diff --git a/dom/filesystem/compat/FileSystemFileEntry.cpp b/dom/filesystem/compat/FileSystemFileEntry.cpp index 6302df06d..13341577c 100644 --- a/dom/filesystem/compat/FileSystemFileEntry.cpp +++ b/dom/filesystem/compat/FileSystemFileEntry.cpp @@ -75,7 +75,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(FileSystemFileEntry, FileSystemEntry, mFile) NS_IMPL_ADDREF_INHERITED(FileSystemFileEntry, FileSystemEntry) NS_IMPL_RELEASE_INHERITED(FileSystemFileEntry, FileSystemEntry) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(FileSystemFileEntry) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FileSystemFileEntry) NS_INTERFACE_MAP_END_INHERITING(FileSystemEntry) FileSystemFileEntry::FileSystemFileEntry(nsIGlobalObject* aGlobal, diff --git a/dom/filesystem/compat/FileSystemRootDirectoryEntry.cpp b/dom/filesystem/compat/FileSystemRootDirectoryEntry.cpp index 68ce62aa2..62e5bc68e 100644 --- a/dom/filesystem/compat/FileSystemRootDirectoryEntry.cpp +++ b/dom/filesystem/compat/FileSystemRootDirectoryEntry.cpp @@ -17,7 +17,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(FileSystemRootDirectoryEntry, NS_IMPL_ADDREF_INHERITED(FileSystemRootDirectoryEntry, FileSystemDirectoryEntry) NS_IMPL_RELEASE_INHERITED(FileSystemRootDirectoryEntry, FileSystemDirectoryEntry) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(FileSystemRootDirectoryEntry) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FileSystemRootDirectoryEntry) NS_INTERFACE_MAP_END_INHERITING(FileSystemDirectoryEntry) FileSystemRootDirectoryEntry::FileSystemRootDirectoryEntry(nsIGlobalObject* aGlobal, diff --git a/dom/filesystem/compat/FileSystemRootDirectoryReader.cpp b/dom/filesystem/compat/FileSystemRootDirectoryReader.cpp index 5b4a41752..4f4ac001d 100644 --- a/dom/filesystem/compat/FileSystemRootDirectoryReader.cpp +++ b/dom/filesystem/compat/FileSystemRootDirectoryReader.cpp @@ -53,7 +53,7 @@ NS_IMPL_ADDREF_INHERITED(FileSystemRootDirectoryReader, NS_IMPL_RELEASE_INHERITED(FileSystemRootDirectoryReader, FileSystemDirectoryReader) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(FileSystemRootDirectoryReader) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FileSystemRootDirectoryReader) NS_INTERFACE_MAP_END_INHERITING(FileSystemDirectoryReader) FileSystemRootDirectoryReader::FileSystemRootDirectoryReader(FileSystemDirectoryEntry* aParentEntry, diff --git a/dom/flyweb/FlyWebServerEvents.cpp b/dom/flyweb/FlyWebServerEvents.cpp index fe774ffb0..0d847ffcc 100644 --- a/dom/flyweb/FlyWebServerEvents.cpp +++ b/dom/flyweb/FlyWebServerEvents.cpp @@ -35,7 +35,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(FlyWebFetchEvent, Event) NS_IMPL_CYCLE_COLLECTION_UNLINK(mRequest) NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(FlyWebFetchEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FlyWebFetchEvent) NS_INTERFACE_MAP_END_INHERITING(Event) FlyWebFetchEvent::FlyWebFetchEvent(FlyWebPublishedServer* aServer, diff --git a/dom/gamepad/GamepadServiceTest.cpp b/dom/gamepad/GamepadServiceTest.cpp index 3a722cffa..39e899f84 100644 --- a/dom/gamepad/GamepadServiceTest.cpp +++ b/dom/gamepad/GamepadServiceTest.cpp @@ -43,7 +43,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(GamepadServiceTest, NS_IMPL_CYCLE_COLLECTION_UNLINK(mWindow) NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(GamepadServiceTest) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(GamepadServiceTest) NS_INTERFACE_MAP_ENTRY(nsIIPCBackgroundChildCreateCallback) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/html/HTMLCanvasElement.cpp b/dom/html/HTMLCanvasElement.cpp index 5ac2c10e4..24366effd 100644 --- a/dom/html/HTMLCanvasElement.cpp +++ b/dom/html/HTMLCanvasElement.cpp @@ -708,7 +708,7 @@ NS_IMPL_ADDREF_INHERITED(CanvasCaptureTrackSource, MediaStreamTrackSource) NS_IMPL_RELEASE_INHERITED(CanvasCaptureTrackSource, MediaStreamTrackSource) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(CanvasCaptureTrackSource) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CanvasCaptureTrackSource) NS_INTERFACE_MAP_END_INHERITING(MediaStreamTrackSource) NS_IMPL_CYCLE_COLLECTION_INHERITED(CanvasCaptureTrackSource, MediaStreamTrackSource, diff --git a/dom/html/HTMLDataListElement.cpp b/dom/html/HTMLDataListElement.cpp index 5aa772645..e0c8713a0 100644 --- a/dom/html/HTMLDataListElement.cpp +++ b/dom/html/HTMLDataListElement.cpp @@ -28,7 +28,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLDataListElement, nsGenericHTMLElement, NS_IMPL_ADDREF_INHERITED(HTMLDataListElement, Element) NS_IMPL_RELEASE_INHERITED(HTMLDataListElement, Element) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLDataListElement) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(HTMLDataListElement) NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement) diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp index 8d10dc2f1..067c25c6a 100644 --- a/dom/html/HTMLMediaElement.cpp +++ b/dom/html/HTMLMediaElement.cpp @@ -1428,7 +1428,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(HTMLMediaElement, nsGenericHTMLE NS_IMPL_CYCLE_COLLECTION_UNLINK(mPendingPlayPromises) NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLMediaElement) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(HTMLMediaElement) NS_INTERFACE_MAP_ENTRY(nsIDOMHTMLMediaElement) NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement) @@ -3042,7 +3042,7 @@ NS_IMPL_ADDREF_INHERITED(HTMLMediaElement::StreamCaptureTrackSource, MediaStreamTrackSource) NS_IMPL_RELEASE_INHERITED(HTMLMediaElement::StreamCaptureTrackSource, MediaStreamTrackSource) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLMediaElement::StreamCaptureTrackSource) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(HTMLMediaElement::StreamCaptureTrackSource) NS_INTERFACE_MAP_END_INHERITING(MediaStreamTrackSource) NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLMediaElement::StreamCaptureTrackSource, MediaStreamTrackSource, @@ -3121,7 +3121,7 @@ NS_IMPL_ADDREF_INHERITED(HTMLMediaElement::DecoderCaptureTrackSource, MediaStreamTrackSource) NS_IMPL_RELEASE_INHERITED(HTMLMediaElement::DecoderCaptureTrackSource, MediaStreamTrackSource) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLMediaElement::DecoderCaptureTrackSource) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(HTMLMediaElement::DecoderCaptureTrackSource) NS_INTERFACE_MAP_END_INHERITING(MediaStreamTrackSource) NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLMediaElement::DecoderCaptureTrackSource, MediaStreamTrackSource, @@ -3165,7 +3165,7 @@ NS_IMPL_ADDREF_INHERITED(HTMLMediaElement::CaptureStreamTrackSourceGetter, MediaStreamTrackSourceGetter) NS_IMPL_RELEASE_INHERITED(HTMLMediaElement::CaptureStreamTrackSourceGetter, MediaStreamTrackSourceGetter) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLMediaElement::CaptureStreamTrackSourceGetter) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(HTMLMediaElement::CaptureStreamTrackSourceGetter) NS_INTERFACE_MAP_END_INHERITING(MediaStreamTrackSourceGetter) NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLMediaElement::CaptureStreamTrackSourceGetter, MediaStreamTrackSourceGetter, diff --git a/dom/html/HTMLSourceElement.cpp b/dom/html/HTMLSourceElement.cpp index 477e29429..746b7aa0e 100644 --- a/dom/html/HTMLSourceElement.cpp +++ b/dom/html/HTMLSourceElement.cpp @@ -39,7 +39,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLSourceElement, nsGenericHTMLElement, NS_IMPL_ADDREF_INHERITED(HTMLSourceElement, nsGenericHTMLElement) NS_IMPL_RELEASE_INHERITED(HTMLSourceElement, nsGenericHTMLElement) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLSourceElement) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(HTMLSourceElement) NS_INTERFACE_MAP_ENTRY(nsIDOMHTMLSourceElement) NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement) diff --git a/dom/html/HTMLTableElement.cpp b/dom/html/HTMLTableElement.cpp index 81d8e51ef..4b642f7af 100644 --- a/dom/html/HTMLTableElement.cpp +++ b/dom/html/HTMLTableElement.cpp @@ -365,7 +365,7 @@ NS_IMPL_ADDREF_INHERITED(HTMLTableElement, Element) NS_IMPL_RELEASE_INHERITED(HTMLTableElement, Element) // QueryInterface implementation for HTMLTableElement -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLTableElement) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(HTMLTableElement) NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement) diff --git a/dom/html/HTMLTableRowElement.cpp b/dom/html/HTMLTableRowElement.cpp index ac2463400..e43bcddb7 100644 --- a/dom/html/HTMLTableRowElement.cpp +++ b/dom/html/HTMLTableRowElement.cpp @@ -40,7 +40,7 @@ NS_IMPL_ADDREF_INHERITED(HTMLTableRowElement, Element) NS_IMPL_RELEASE_INHERITED(HTMLTableRowElement, Element) // QueryInterface implementation for HTMLTableRowElement -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLTableRowElement) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(HTMLTableRowElement) NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement) diff --git a/dom/html/HTMLTableSectionElement.cpp b/dom/html/HTMLTableSectionElement.cpp index e99597636..357cdb21b 100644 --- a/dom/html/HTMLTableSectionElement.cpp +++ b/dom/html/HTMLTableSectionElement.cpp @@ -40,7 +40,7 @@ NS_IMPL_ADDREF_INHERITED(HTMLTableSectionElement, Element) NS_IMPL_RELEASE_INHERITED(HTMLTableSectionElement, Element) // QueryInterface implementation for HTMLTableSectionElement -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLTableSectionElement) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(HTMLTableSectionElement) NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement) diff --git a/dom/html/HTMLTemplateElement.cpp b/dom/html/HTMLTemplateElement.cpp index 27fb12870..11d012037 100644 --- a/dom/html/HTMLTemplateElement.cpp +++ b/dom/html/HTMLTemplateElement.cpp @@ -57,7 +57,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(HTMLTemplateElement, NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END // QueryInterface implementation for HTMLTemplateElement -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLTemplateElement) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(HTMLTemplateElement) NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement) NS_IMPL_ELEMENT_CLONE(HTMLTemplateElement) diff --git a/dom/html/HTMLTrackElement.cpp b/dom/html/HTMLTrackElement.cpp index 610cd06e8..b4362860d 100644 --- a/dom/html/HTMLTrackElement.cpp +++ b/dom/html/HTMLTrackElement.cpp @@ -152,7 +152,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLTrackElement, Element) NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLTrackElement, nsGenericHTMLElement, mTrack, mMediaParent, mListener) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLTrackElement) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(HTMLTrackElement) NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement) void diff --git a/dom/indexedDB/IDBDatabase.cpp b/dom/indexedDB/IDBDatabase.cpp index 393a94900..475d6aadd 100644 --- a/dom/indexedDB/IDBDatabase.cpp +++ b/dom/indexedDB/IDBDatabase.cpp @@ -1230,7 +1230,7 @@ IDBDatabase::LogWarning(const char* aMessageName, NS_IMPL_ADDREF_INHERITED(IDBDatabase, IDBWrapperCache) NS_IMPL_RELEASE_INHERITED(IDBDatabase, IDBWrapperCache) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(IDBDatabase) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(IDBDatabase) NS_INTERFACE_MAP_END_INHERITING(IDBWrapperCache) NS_IMPL_CYCLE_COLLECTION_CLASS(IDBDatabase) diff --git a/dom/indexedDB/IDBFileHandle.cpp b/dom/indexedDB/IDBFileHandle.cpp index 6cfc10c9a..18f5a98df 100644 --- a/dom/indexedDB/IDBFileHandle.cpp +++ b/dom/indexedDB/IDBFileHandle.cpp @@ -99,7 +99,7 @@ IDBFileHandle::GetMetadata(const IDBFileMetadataParameters& aParameters, NS_IMPL_ADDREF_INHERITED(IDBFileHandle, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(IDBFileHandle, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(IDBFileHandle) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(IDBFileHandle) NS_INTERFACE_MAP_ENTRY(nsIRunnable) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/indexedDB/IDBFileRequest.cpp b/dom/indexedDB/IDBFileRequest.cpp index 1401f7c76..eb3f12815 100644 --- a/dom/indexedDB/IDBFileRequest.cpp +++ b/dom/indexedDB/IDBFileRequest.cpp @@ -57,7 +57,7 @@ IDBFileRequest::Create(nsPIDOMWindowInner* aOwner, IDBFileHandle* aFileHandle, NS_IMPL_ADDREF_INHERITED(IDBFileRequest, DOMRequest) NS_IMPL_RELEASE_INHERITED(IDBFileRequest, DOMRequest) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(IDBFileRequest) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(IDBFileRequest) NS_INTERFACE_MAP_END_INHERITING(DOMRequest) NS_IMPL_CYCLE_COLLECTION_INHERITED(IDBFileRequest, DOMRequest, diff --git a/dom/indexedDB/IDBMutableFile.cpp b/dom/indexedDB/IDBMutableFile.cpp index 9e9bfc4ee..940ea21b6 100644 --- a/dom/indexedDB/IDBMutableFile.cpp +++ b/dom/indexedDB/IDBMutableFile.cpp @@ -218,7 +218,7 @@ IDBMutableFile::GetFile(ErrorResult& aError) NS_IMPL_ADDREF_INHERITED(IDBMutableFile, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(IDBMutableFile, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(IDBMutableFile) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(IDBMutableFile) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_CLASS(IDBMutableFile) diff --git a/dom/indexedDB/IDBRequest.cpp b/dom/indexedDB/IDBRequest.cpp index 5ce077e33..5e75a452a 100644 --- a/dom/indexedDB/IDBRequest.cpp +++ b/dom/indexedDB/IDBRequest.cpp @@ -439,7 +439,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(IDBRequest, IDBWrapperCache) NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mResultVal) NS_IMPL_CYCLE_COLLECTION_TRACE_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(IDBRequest) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(IDBRequest) if (aIID.Equals(kIDBRequestIID)) { foundInterface = this; } else @@ -615,7 +615,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(IDBOpenDBRequest, // Don't unlink mFactory! NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(IDBOpenDBRequest) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(IDBOpenDBRequest) NS_INTERFACE_MAP_END_INHERITING(IDBRequest) NS_IMPL_ADDREF_INHERITED(IDBOpenDBRequest, IDBRequest) diff --git a/dom/indexedDB/IDBTransaction.cpp b/dom/indexedDB/IDBTransaction.cpp index ad545c6c1..bfe2c649c 100644 --- a/dom/indexedDB/IDBTransaction.cpp +++ b/dom/indexedDB/IDBTransaction.cpp @@ -962,7 +962,7 @@ IDBTransaction::ObjectStore(const nsAString& aName, ErrorResult& aRv) NS_IMPL_ADDREF_INHERITED(IDBTransaction, IDBWrapperCache) NS_IMPL_RELEASE_INHERITED(IDBTransaction, IDBWrapperCache) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(IDBTransaction) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(IDBTransaction) NS_INTERFACE_MAP_ENTRY(nsIRunnable) NS_INTERFACE_MAP_END_INHERITING(IDBWrapperCache) diff --git a/dom/indexedDB/IDBWrapperCache.cpp b/dom/indexedDB/IDBWrapperCache.cpp index ccc2bb43e..0f8642de1 100644 --- a/dom/indexedDB/IDBWrapperCache.cpp +++ b/dom/indexedDB/IDBWrapperCache.cpp @@ -35,7 +35,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(IDBWrapperCache, NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mScriptOwner) NS_IMPL_CYCLE_COLLECTION_TRACE_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(IDBWrapperCache) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(IDBWrapperCache) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(IDBWrapperCache, DOMEventTargetHelper) diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 0ec5de91d..7ee46ec00 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -705,7 +705,7 @@ TabChild::UpdateFrameType() nsIDocShell::FRAME_TYPE_REGULAR); } -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TabChild) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TabChild) NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome) NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome2) NS_INTERFACE_MAP_ENTRY(nsIEmbeddingSiteWindow) @@ -3319,7 +3319,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(TabChildGlobal, tmp->TraverseHostObjectURIs(cb); NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TabChildGlobal) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TabChildGlobal) NS_INTERFACE_MAP_ENTRY(nsIMessageListenerManager) NS_INTERFACE_MAP_ENTRY(nsIMessageSender) NS_INTERFACE_MAP_ENTRY(nsISyncMessageSender) diff --git a/dom/media/CanvasCaptureMediaStream.cpp b/dom/media/CanvasCaptureMediaStream.cpp index c30f2f3f4..988102b69 100644 --- a/dom/media/CanvasCaptureMediaStream.cpp +++ b/dom/media/CanvasCaptureMediaStream.cpp @@ -214,7 +214,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(CanvasCaptureMediaStream, DOMMediaStream, NS_IMPL_ADDREF_INHERITED(CanvasCaptureMediaStream, DOMMediaStream) NS_IMPL_RELEASE_INHERITED(CanvasCaptureMediaStream, DOMMediaStream) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(CanvasCaptureMediaStream) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CanvasCaptureMediaStream) NS_INTERFACE_MAP_END_INHERITING(DOMMediaStream) CanvasCaptureMediaStream::CanvasCaptureMediaStream(nsPIDOMWindowInner* aWindow, diff --git a/dom/media/DOMMediaStream.cpp b/dom/media/DOMMediaStream.cpp index ada3e0f7e..857831f9b 100644 --- a/dom/media/DOMMediaStream.cpp +++ b/dom/media/DOMMediaStream.cpp @@ -344,7 +344,7 @@ NS_IMPL_ADDREF_INHERITED(DOMMediaStream::PlaybackTrackListener, MediaStreamTrackConsumer) NS_IMPL_RELEASE_INHERITED(DOMMediaStream::PlaybackTrackListener, MediaStreamTrackConsumer) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DOMMediaStream::PlaybackTrackListener) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMMediaStream::PlaybackTrackListener) NS_INTERFACE_MAP_END_INHERITING(MediaStreamTrackConsumer) NS_IMPL_CYCLE_COLLECTION_INHERITED(DOMMediaStream::PlaybackTrackListener, MediaStreamTrackConsumer, @@ -380,7 +380,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_ADDREF_INHERITED(DOMMediaStream, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(DOMMediaStream, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DOMMediaStream) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMMediaStream) NS_INTERFACE_MAP_ENTRY(DOMMediaStream) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) @@ -397,7 +397,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(DOMAudioNodeMediaStream, DOMMediaStream, NS_IMPL_ADDREF_INHERITED(DOMAudioNodeMediaStream, DOMMediaStream) NS_IMPL_RELEASE_INHERITED(DOMAudioNodeMediaStream, DOMMediaStream) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DOMAudioNodeMediaStream) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMAudioNodeMediaStream) NS_INTERFACE_MAP_END_INHERITING(DOMMediaStream) DOMMediaStream::DOMMediaStream(nsPIDOMWindowInner* aWindow, @@ -704,7 +704,7 @@ NS_IMPL_ADDREF_INHERITED(ClonedStreamSourceGetter, MediaStreamTrackSourceGetter) NS_IMPL_RELEASE_INHERITED(ClonedStreamSourceGetter, MediaStreamTrackSourceGetter) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ClonedStreamSourceGetter) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ClonedStreamSourceGetter) NS_INTERFACE_MAP_END_INHERITING(MediaStreamTrackSourceGetter) NS_IMPL_CYCLE_COLLECTION_INHERITED(ClonedStreamSourceGetter, MediaStreamTrackSourceGetter, diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp index ed03c7634..2105b4d91 100644 --- a/dom/media/MediaManager.cpp +++ b/dom/media/MediaManager.cpp @@ -955,7 +955,7 @@ protected: NS_IMPL_ADDREF_INHERITED(FakeTrackSourceGetter, MediaStreamTrackSourceGetter) NS_IMPL_RELEASE_INHERITED(FakeTrackSourceGetter, MediaStreamTrackSourceGetter) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(FakeTrackSourceGetter) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FakeTrackSourceGetter) NS_INTERFACE_MAP_END_INHERITING(MediaStreamTrackSourceGetter) NS_IMPL_CYCLE_COLLECTION_INHERITED(FakeTrackSourceGetter, MediaStreamTrackSourceGetter, diff --git a/dom/media/MediaRecorder.cpp b/dom/media/MediaRecorder.cpp index 8d97ec1d8..0170c276c 100644 --- a/dom/media/MediaRecorder.cpp +++ b/dom/media/MediaRecorder.cpp @@ -118,7 +118,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(MediaRecorder, NS_IMPL_CYCLE_COLLECTION_UNLINK(mDocument) NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaRecorder) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaRecorder) NS_INTERFACE_MAP_ENTRY(nsIDocumentActivity) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/media/MediaStreamTrack.cpp b/dom/media/MediaStreamTrack.cpp index 731ba34ef..8c5c6291a 100644 --- a/dom/media/MediaStreamTrack.cpp +++ b/dom/media/MediaStreamTrack.cpp @@ -205,7 +205,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_ADDREF_INHERITED(MediaStreamTrack, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(MediaStreamTrack, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaStreamTrack) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaStreamTrack) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) nsPIDOMWindowInner* diff --git a/dom/media/MediaTrack.cpp b/dom/media/MediaTrack.cpp index 02ddf22b1..392bc69d9 100644 --- a/dom/media/MediaTrack.cpp +++ b/dom/media/MediaTrack.cpp @@ -31,7 +31,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(MediaTrack, DOMEventTargetHelper, mList) NS_IMPL_ADDREF_INHERITED(MediaTrack, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(MediaTrack, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaTrack) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaTrack) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) void diff --git a/dom/media/MediaTrackList.cpp b/dom/media/MediaTrackList.cpp index f6bc29d2f..5a5b8d22b 100644 --- a/dom/media/MediaTrackList.cpp +++ b/dom/media/MediaTrackList.cpp @@ -34,7 +34,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(MediaTrackList, NS_IMPL_ADDREF_INHERITED(MediaTrackList, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(MediaTrackList, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaTrackList) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaTrackList) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) MediaTrack* diff --git a/dom/media/TextTrack.cpp b/dom/media/TextTrack.cpp index 3f4af7a8b..be4010599 100644 --- a/dom/media/TextTrack.cpp +++ b/dom/media/TextTrack.cpp @@ -25,7 +25,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(TextTrack, NS_IMPL_ADDREF_INHERITED(TextTrack, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(TextTrack, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TextTrack) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TextTrack) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) TextTrack::TextTrack(nsPIDOMWindowInner* aOwnerWindow, diff --git a/dom/media/TextTrackCue.cpp b/dom/media/TextTrackCue.cpp index 9f6d8f485..34cec511b 100644 --- a/dom/media/TextTrackCue.cpp +++ b/dom/media/TextTrackCue.cpp @@ -23,7 +23,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(TextTrackCue, NS_IMPL_ADDREF_INHERITED(TextTrackCue, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(TextTrackCue, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TextTrackCue) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TextTrackCue) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) StaticRefPtr TextTrackCue::sParserWrapper; diff --git a/dom/media/TextTrackList.cpp b/dom/media/TextTrackList.cpp index e557d97f5..afeff816f 100644 --- a/dom/media/TextTrackList.cpp +++ b/dom/media/TextTrackList.cpp @@ -20,7 +20,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(TextTrackList, NS_IMPL_ADDREF_INHERITED(TextTrackList, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(TextTrackList, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TextTrackList) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TextTrackList) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) TextTrackList::TextTrackList(nsPIDOMWindowInner* aOwnerWindow) diff --git a/dom/media/VideoTrack.cpp b/dom/media/VideoTrack.cpp index 8fcb613ab..df41cccc6 100644 --- a/dom/media/VideoTrack.cpp +++ b/dom/media/VideoTrack.cpp @@ -31,7 +31,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(VideoTrack, MediaTrack, mVideoStreamTrack) NS_IMPL_ADDREF_INHERITED(VideoTrack, MediaTrack) NS_IMPL_RELEASE_INHERITED(VideoTrack, MediaTrack) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(VideoTrack) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(VideoTrack) NS_INTERFACE_MAP_END_INHERITING(MediaTrack) JSObject* diff --git a/dom/media/eme/MediaEncryptedEvent.cpp b/dom/media/eme/MediaEncryptedEvent.cpp index fe1c8a3bc..3606abd7a 100644 --- a/dom/media/eme/MediaEncryptedEvent.cpp +++ b/dom/media/eme/MediaEncryptedEvent.cpp @@ -31,7 +31,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(MediaEncryptedEvent, Event) mozilla::DropJSObjects(this); NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaEncryptedEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaEncryptedEvent) NS_INTERFACE_MAP_END_INHERITING(Event) MediaEncryptedEvent::MediaEncryptedEvent(EventTarget* aOwner) diff --git a/dom/media/eme/MediaKeyMessageEvent.cpp b/dom/media/eme/MediaKeyMessageEvent.cpp index 289d0c16e..30597736d 100644 --- a/dom/media/eme/MediaKeyMessageEvent.cpp +++ b/dom/media/eme/MediaKeyMessageEvent.cpp @@ -35,7 +35,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(MediaKeyMessageEvent, Event) mozilla::DropJSObjects(this); NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaKeyMessageEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaKeyMessageEvent) NS_INTERFACE_MAP_END_INHERITING(Event) MediaKeyMessageEvent::MediaKeyMessageEvent(EventTarget* aOwner) diff --git a/dom/media/eme/MediaKeySession.cpp b/dom/media/eme/MediaKeySession.cpp index fe34d9220..a990f3b16 100644 --- a/dom/media/eme/MediaKeySession.cpp +++ b/dom/media/eme/MediaKeySession.cpp @@ -33,7 +33,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(MediaKeySession, mKeyStatusMap, mClosed) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaKeySession) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaKeySession) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(MediaKeySession, DOMEventTargetHelper) diff --git a/dom/media/imagecapture/ImageCapture.cpp b/dom/media/imagecapture/ImageCapture.cpp index 377b27e4e..ba62f5526 100644 --- a/dom/media/imagecapture/ImageCapture.cpp +++ b/dom/media/imagecapture/ImageCapture.cpp @@ -28,7 +28,7 @@ namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(ImageCapture, DOMEventTargetHelper, mVideoStreamTrack) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ImageCapture) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ImageCapture) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(ImageCapture, DOMEventTargetHelper) diff --git a/dom/media/mediasource/MediaSource.cpp b/dom/media/mediasource/MediaSource.cpp index db1f340e4..8692e5c08 100644 --- a/dom/media/mediasource/MediaSource.cpp +++ b/dom/media/mediasource/MediaSource.cpp @@ -584,7 +584,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(MediaSource, DOMEventTargetHelper, NS_IMPL_ADDREF_INHERITED(MediaSource, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(MediaSource, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaSource) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaSource) NS_INTERFACE_MAP_ENTRY(mozilla::dom::MediaSource) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/media/mediasource/SourceBuffer.cpp b/dom/media/mediasource/SourceBuffer.cpp index 70e2abf5e..c6682a630 100644 --- a/dom/media/mediasource/SourceBuffer.cpp +++ b/dom/media/mediasource/SourceBuffer.cpp @@ -587,7 +587,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_ADDREF_INHERITED(SourceBuffer, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(SourceBuffer, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(SourceBuffer) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SourceBuffer) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) #undef MSE_DEBUG diff --git a/dom/media/mediasource/SourceBufferList.cpp b/dom/media/mediasource/SourceBufferList.cpp index cf7a7ed9d..fc8f7f027 100644 --- a/dom/media/mediasource/SourceBufferList.cpp +++ b/dom/media/mediasource/SourceBufferList.cpp @@ -215,7 +215,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(SourceBufferList, DOMEventTargetHelper, NS_IMPL_ADDREF_INHERITED(SourceBufferList, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(SourceBufferList, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(SourceBufferList) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SourceBufferList) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) #undef MSE_API diff --git a/dom/media/webaudio/AudioBufferSourceNode.cpp b/dom/media/webaudio/AudioBufferSourceNode.cpp index cca5e050f..e17c79006 100644 --- a/dom/media/webaudio/AudioBufferSourceNode.cpp +++ b/dom/media/webaudio/AudioBufferSourceNode.cpp @@ -25,7 +25,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(AudioBufferSourceNode, AudioScheduledSourceNode, mBuffer, mPlaybackRate, mDetune) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(AudioBufferSourceNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AudioBufferSourceNode) NS_INTERFACE_MAP_END_INHERITING(AudioScheduledSourceNode) NS_IMPL_ADDREF_INHERITED(AudioBufferSourceNode, AudioScheduledSourceNode) diff --git a/dom/media/webaudio/AudioContext.cpp b/dom/media/webaudio/AudioContext.cpp index d8e2664fc..e36b984bb 100644 --- a/dom/media/webaudio/AudioContext.cpp +++ b/dom/media/webaudio/AudioContext.cpp @@ -111,7 +111,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_ADDREF_INHERITED(AudioContext, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(AudioContext, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(AudioContext) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AudioContext) NS_INTERFACE_MAP_ENTRY(nsIMemoryReporter) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/media/webaudio/AudioDestinationNode.cpp b/dom/media/webaudio/AudioDestinationNode.cpp index 00a2a1f32..c652f2cc2 100644 --- a/dom/media/webaudio/AudioDestinationNode.cpp +++ b/dom/media/webaudio/AudioDestinationNode.cpp @@ -313,7 +313,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(AudioDestinationNode, AudioNode, mAudioChannelAgent, mOfflineRenderingPromise) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(AudioDestinationNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AudioDestinationNode) NS_INTERFACE_MAP_ENTRY(nsIAudioChannelAgentCallback) NS_INTERFACE_MAP_END_INHERITING(AudioNode) diff --git a/dom/media/webaudio/AudioNode.cpp b/dom/media/webaudio/AudioNode.cpp index 05e174116..27ee6873a 100644 --- a/dom/media/webaudio/AudioNode.cpp +++ b/dom/media/webaudio/AudioNode.cpp @@ -38,7 +38,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_ADDREF_INHERITED(AudioNode, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(AudioNode, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(AudioNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AudioNode) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/media/webaudio/AudioProcessingEvent.cpp b/dom/media/webaudio/AudioProcessingEvent.cpp index 4aa8d9d74..944d8919e 100644 --- a/dom/media/webaudio/AudioProcessingEvent.cpp +++ b/dom/media/webaudio/AudioProcessingEvent.cpp @@ -14,7 +14,7 @@ namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(AudioProcessingEvent, Event, mInputBuffer, mOutputBuffer, mNode) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(AudioProcessingEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AudioProcessingEvent) NS_INTERFACE_MAP_END_INHERITING(Event) NS_IMPL_ADDREF_INHERITED(AudioProcessingEvent, Event) diff --git a/dom/media/webaudio/BiquadFilterNode.cpp b/dom/media/webaudio/BiquadFilterNode.cpp index 27eefb9b9..eea615e08 100644 --- a/dom/media/webaudio/BiquadFilterNode.cpp +++ b/dom/media/webaudio/BiquadFilterNode.cpp @@ -20,7 +20,7 @@ namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(BiquadFilterNode, AudioNode, mFrequency, mDetune, mQ, mGain) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(BiquadFilterNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(BiquadFilterNode) NS_INTERFACE_MAP_END_INHERITING(AudioNode) NS_IMPL_ADDREF_INHERITED(BiquadFilterNode, AudioNode) diff --git a/dom/media/webaudio/ConstantSourceNode.cpp b/dom/media/webaudio/ConstantSourceNode.cpp index 0c23c548d..fa1018431 100644 --- a/dom/media/webaudio/ConstantSourceNode.cpp +++ b/dom/media/webaudio/ConstantSourceNode.cpp @@ -14,7 +14,7 @@ namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(ConstantSourceNode, AudioScheduledSourceNode, mOffset) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ConstantSourceNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ConstantSourceNode) NS_INTERFACE_MAP_END_INHERITING(AudioScheduledSourceNode) NS_IMPL_ADDREF_INHERITED(ConstantSourceNode, AudioScheduledSourceNode) diff --git a/dom/media/webaudio/ConvolverNode.cpp b/dom/media/webaudio/ConvolverNode.cpp index ac69628c8..2d40c4b59 100644 --- a/dom/media/webaudio/ConvolverNode.cpp +++ b/dom/media/webaudio/ConvolverNode.cpp @@ -17,7 +17,7 @@ namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(ConvolverNode, AudioNode, mBuffer) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ConvolverNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ConvolverNode) NS_INTERFACE_MAP_END_INHERITING(AudioNode) NS_IMPL_ADDREF_INHERITED(ConvolverNode, AudioNode) diff --git a/dom/media/webaudio/DelayNode.cpp b/dom/media/webaudio/DelayNode.cpp index 75a16c749..691c07f8f 100644 --- a/dom/media/webaudio/DelayNode.cpp +++ b/dom/media/webaudio/DelayNode.cpp @@ -18,7 +18,7 @@ namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(DelayNode, AudioNode, mDelay) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DelayNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DelayNode) NS_INTERFACE_MAP_END_INHERITING(AudioNode) NS_IMPL_ADDREF_INHERITED(DelayNode, AudioNode) diff --git a/dom/media/webaudio/DynamicsCompressorNode.cpp b/dom/media/webaudio/DynamicsCompressorNode.cpp index bf4ac1c38..e31d9eee2 100644 --- a/dom/media/webaudio/DynamicsCompressorNode.cpp +++ b/dom/media/webaudio/DynamicsCompressorNode.cpp @@ -24,7 +24,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(DynamicsCompressorNode, AudioNode, mAttack, mRelease) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DynamicsCompressorNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DynamicsCompressorNode) NS_INTERFACE_MAP_END_INHERITING(AudioNode) NS_IMPL_ADDREF_INHERITED(DynamicsCompressorNode, AudioNode) diff --git a/dom/media/webaudio/GainNode.cpp b/dom/media/webaudio/GainNode.cpp index 4b6d06127..bb5b56d52 100644 --- a/dom/media/webaudio/GainNode.cpp +++ b/dom/media/webaudio/GainNode.cpp @@ -18,7 +18,7 @@ namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(GainNode, AudioNode, mGain) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(GainNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(GainNode) NS_INTERFACE_MAP_END_INHERITING(AudioNode) NS_IMPL_ADDREF_INHERITED(GainNode, AudioNode) diff --git a/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp b/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp index bfc08a08a..8ee326739 100644 --- a/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp +++ b/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp @@ -58,7 +58,7 @@ NS_IMPL_ADDREF_INHERITED(AudioDestinationTrackSource, MediaStreamTrackSource) NS_IMPL_RELEASE_INHERITED(AudioDestinationTrackSource, MediaStreamTrackSource) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(AudioDestinationTrackSource) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AudioDestinationTrackSource) NS_INTERFACE_MAP_END_INHERITING(MediaStreamTrackSource) NS_IMPL_CYCLE_COLLECTION_INHERITED(AudioDestinationTrackSource, MediaStreamTrackSource, @@ -66,7 +66,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(AudioDestinationTrackSource, NS_IMPL_CYCLE_COLLECTION_INHERITED(MediaStreamAudioDestinationNode, AudioNode, mDOMStream) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaStreamAudioDestinationNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaStreamAudioDestinationNode) NS_INTERFACE_MAP_END_INHERITING(AudioNode) NS_IMPL_ADDREF_INHERITED(MediaStreamAudioDestinationNode, AudioNode) diff --git a/dom/media/webaudio/MediaStreamAudioSourceNode.cpp b/dom/media/webaudio/MediaStreamAudioSourceNode.cpp index 75c4ba31e..7d29d19cb 100644 --- a/dom/media/webaudio/MediaStreamAudioSourceNode.cpp +++ b/dom/media/webaudio/MediaStreamAudioSourceNode.cpp @@ -27,7 +27,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(MediaStreamAudioSourceNode, Au NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mInputTrack) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaStreamAudioSourceNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaStreamAudioSourceNode) NS_INTERFACE_MAP_END_INHERITING(AudioNode) NS_IMPL_ADDREF_INHERITED(MediaStreamAudioSourceNode, AudioNode) diff --git a/dom/media/webaudio/OscillatorNode.cpp b/dom/media/webaudio/OscillatorNode.cpp index 3a9901215..fb142c944 100644 --- a/dom/media/webaudio/OscillatorNode.cpp +++ b/dom/media/webaudio/OscillatorNode.cpp @@ -17,7 +17,7 @@ namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(OscillatorNode, AudioScheduledSourceNode, mPeriodicWave, mFrequency, mDetune) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(OscillatorNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(OscillatorNode) NS_INTERFACE_MAP_END_INHERITING(AudioScheduledSourceNode) NS_IMPL_ADDREF_INHERITED(OscillatorNode, AudioScheduledSourceNode) diff --git a/dom/media/webaudio/PannerNode.cpp b/dom/media/webaudio/PannerNode.cpp index 4d6f96823..9269e04cf 100644 --- a/dom/media/webaudio/PannerNode.cpp +++ b/dom/media/webaudio/PannerNode.cpp @@ -35,7 +35,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(PannerNode, AudioNode) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPositionX, mPositionY, mPositionZ, mOrientationX, mOrientationY, mOrientationZ) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(PannerNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PannerNode) NS_INTERFACE_MAP_END_INHERITING(AudioNode) NS_IMPL_ADDREF_INHERITED(PannerNode, AudioNode) diff --git a/dom/media/webaudio/StereoPannerNode.cpp b/dom/media/webaudio/StereoPannerNode.cpp index aab6d1b4e..a17c96c05 100644 --- a/dom/media/webaudio/StereoPannerNode.cpp +++ b/dom/media/webaudio/StereoPannerNode.cpp @@ -21,7 +21,7 @@ using namespace std; NS_IMPL_CYCLE_COLLECTION_INHERITED(StereoPannerNode, AudioNode, mPan) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(StereoPannerNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(StereoPannerNode) NS_INTERFACE_MAP_END_INHERITING(AudioNode) NS_IMPL_ADDREF_INHERITED(StereoPannerNode, AudioNode) diff --git a/dom/media/webaudio/WaveShaperNode.cpp b/dom/media/webaudio/WaveShaperNode.cpp index fc5f2a996..cb1bff01a 100644 --- a/dom/media/webaudio/WaveShaperNode.cpp +++ b/dom/media/webaudio/WaveShaperNode.cpp @@ -27,7 +27,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(WaveShaperNode) NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER NS_IMPL_CYCLE_COLLECTION_TRACE_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(WaveShaperNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(WaveShaperNode) NS_INTERFACE_MAP_END_INHERITING(AudioNode) NS_IMPL_ADDREF_INHERITED(WaveShaperNode, AudioNode) diff --git a/dom/media/webspeech/recognition/SpeechRecognition.cpp b/dom/media/webspeech/recognition/SpeechRecognition.cpp index 6e68d6b8c..441bcc4cb 100644 --- a/dom/media/webspeech/recognition/SpeechRecognition.cpp +++ b/dom/media/webspeech/recognition/SpeechRecognition.cpp @@ -103,7 +103,7 @@ GetSpeechRecognitionService(const nsAString& aLang) NS_IMPL_CYCLE_COLLECTION_INHERITED(SpeechRecognition, DOMEventTargetHelper, mDOMStream, mSpeechGrammarList) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(SpeechRecognition) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SpeechRecognition) NS_INTERFACE_MAP_ENTRY(nsIObserver) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/media/webspeech/synth/SpeechSynthesis.cpp b/dom/media/webspeech/synth/SpeechSynthesis.cpp index c60eb3368..189e3590c 100644 --- a/dom/media/webspeech/synth/SpeechSynthesis.cpp +++ b/dom/media/webspeech/synth/SpeechSynthesis.cpp @@ -45,7 +45,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(SpeechSynthesis, DOMEventTarge } NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(SpeechSynthesis) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SpeechSynthesis) NS_INTERFACE_MAP_ENTRY(nsIObserver) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp b/dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp index f5ac047d4..f7ca1af5b 100644 --- a/dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp +++ b/dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp @@ -20,7 +20,7 @@ namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(SpeechSynthesisUtterance, DOMEventTargetHelper, mVoice); -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(SpeechSynthesisUtterance) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SpeechSynthesisUtterance) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(SpeechSynthesisUtterance, DOMEventTargetHelper) diff --git a/dom/messagechannel/MessagePort.cpp b/dom/messagechannel/MessagePort.cpp index 6e7112e44..a793bf315 100644 --- a/dom/messagechannel/MessagePort.cpp +++ b/dom/messagechannel/MessagePort.cpp @@ -195,7 +195,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(MessagePort, NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mUnshippedEntangledPort); NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MessagePort) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MessagePort) NS_INTERFACE_MAP_ENTRY(nsIIPCBackgroundChildCreateCallback) NS_INTERFACE_MAP_ENTRY(nsIObserver) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/network/TCPServerSocket.cpp b/dom/network/TCPServerSocket.cpp index 5e6f778a3..9f166ff81 100644 --- a/dom/network/TCPServerSocket.cpp +++ b/dom/network/TCPServerSocket.cpp @@ -38,7 +38,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_ADDREF_INHERITED(TCPServerSocket, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(TCPServerSocket, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TCPServerSocket) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TCPServerSocket) NS_INTERFACE_MAP_ENTRY(nsIServerSocketListener) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/network/TCPSocket.cpp b/dom/network/TCPSocket.cpp index 0a67aabd8..f9cd5855c 100644 --- a/dom/network/TCPSocket.cpp +++ b/dom/network/TCPSocket.cpp @@ -136,7 +136,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_ADDREF_INHERITED(TCPSocket, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(TCPSocket, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TCPSocket) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TCPSocket) NS_INTERFACE_MAP_ENTRY(nsITransportEventSink) NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) diff --git a/dom/network/UDPSocket.cpp b/dom/network/UDPSocket.cpp index e275e3902..bf4463bb1 100644 --- a/dom/network/UDPSocket.cpp +++ b/dom/network/UDPSocket.cpp @@ -40,7 +40,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_ADDREF_INHERITED(UDPSocket, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(UDPSocket, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(UDPSocket) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(UDPSocket) NS_INTERFACE_MAP_ENTRY(nsIUDPSocketListener) NS_INTERFACE_MAP_ENTRY(nsIUDPSocketInternal) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.cpp index 6df042e75..cb7c4c34b 100644 --- a/dom/notification/Notification.cpp +++ b/dom/notification/Notification.cpp @@ -1229,7 +1229,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_END NS_IMPL_ADDREF_INHERITED(Notification, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(Notification, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(Notification) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Notification) NS_INTERFACE_MAP_ENTRY(nsIObserver) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/notification/NotificationEvent.cpp b/dom/notification/NotificationEvent.cpp index 765dd68cb..4979e1480 100644 --- a/dom/notification/NotificationEvent.cpp +++ b/dom/notification/NotificationEvent.cpp @@ -18,7 +18,7 @@ NotificationEvent::NotificationEvent(EventTarget* aOwner) NS_IMPL_ADDREF_INHERITED(NotificationEvent, ExtendableEvent) NS_IMPL_RELEASE_INHERITED(NotificationEvent, ExtendableEvent) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(NotificationEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(NotificationEvent) NS_INTERFACE_MAP_END_INHERITING(ExtendableEvent) NS_IMPL_CYCLE_COLLECTION_INHERITED(NotificationEvent, ExtendableEvent, mNotification) diff --git a/dom/offline/nsDOMOfflineResourceList.cpp b/dom/offline/nsDOMOfflineResourceList.cpp index a02b29562..53eefdd60 100644 --- a/dom/offline/nsDOMOfflineResourceList.cpp +++ b/dom/offline/nsDOMOfflineResourceList.cpp @@ -60,7 +60,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(nsDOMOfflineResourceList, mCacheUpdate, mPendingEvents) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMOfflineResourceList) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMOfflineResourceList) NS_INTERFACE_MAP_ENTRY(nsIDOMOfflineResourceList) NS_INTERFACE_MAP_ENTRY(nsIOfflineCacheUpdateObserver) NS_INTERFACE_MAP_ENTRY(nsIObserver) diff --git a/dom/performance/Performance.cpp b/dom/performance/Performance.cpp index 52cdfdec4..b0709e5e8 100644 --- a/dom/performance/Performance.cpp +++ b/dom/performance/Performance.cpp @@ -78,7 +78,7 @@ enum class Performance::ResolveTimestampAttribute { Duration, }; -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(Performance) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Performance) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_INHERITED(Performance, diff --git a/dom/performance/PerformanceResourceTiming.cpp b/dom/performance/PerformanceResourceTiming.cpp index 80e1cbc2a..18639be92 100644 --- a/dom/performance/PerformanceResourceTiming.cpp +++ b/dom/performance/PerformanceResourceTiming.cpp @@ -17,7 +17,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(PerformanceResourceTiming, PerformanceEntry) NS_IMPL_CYCLE_COLLECTION_TRACE_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(PerformanceResourceTiming) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PerformanceResourceTiming) NS_INTERFACE_MAP_END_INHERITING(PerformanceEntry) NS_IMPL_ADDREF_INHERITED(PerformanceResourceTiming, PerformanceEntry) diff --git a/dom/presentation/PresentationAvailability.cpp b/dom/presentation/PresentationAvailability.cpp index 93f27dfbf..8aa53f114 100644 --- a/dom/presentation/PresentationAvailability.cpp +++ b/dom/presentation/PresentationAvailability.cpp @@ -32,7 +32,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_ADDREF_INHERITED(PresentationAvailability, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(PresentationAvailability, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(PresentationAvailability) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PresentationAvailability) NS_INTERFACE_MAP_ENTRY(nsIPresentationAvailabilityListener) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/presentation/PresentationConnection.cpp b/dom/presentation/PresentationConnection.cpp index e9c4a71ca..210dbb274 100644 --- a/dom/presentation/PresentationConnection.cpp +++ b/dom/presentation/PresentationConnection.cpp @@ -40,7 +40,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_ADDREF_INHERITED(PresentationConnection, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(PresentationConnection, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(PresentationConnection) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PresentationConnection) NS_INTERFACE_MAP_ENTRY(nsIPresentationSessionListener) NS_INTERFACE_MAP_ENTRY(nsIRequest) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/presentation/PresentationConnectionList.cpp b/dom/presentation/PresentationConnectionList.cpp index 0e0e7696c..32e5f355b 100644 --- a/dom/presentation/PresentationConnectionList.cpp +++ b/dom/presentation/PresentationConnectionList.cpp @@ -22,7 +22,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(PresentationConnectionList, DOMEventTargetHel NS_IMPL_ADDREF_INHERITED(PresentationConnectionList, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(PresentationConnectionList, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(PresentationConnectionList) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PresentationConnectionList) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) PresentationConnectionList::PresentationConnectionList(nsPIDOMWindowInner* aWindow, diff --git a/dom/presentation/PresentationRequest.cpp b/dom/presentation/PresentationRequest.cpp index 30a460fa4..912beea3a 100644 --- a/dom/presentation/PresentationRequest.cpp +++ b/dom/presentation/PresentationRequest.cpp @@ -37,7 +37,7 @@ using namespace mozilla::dom; NS_IMPL_ADDREF_INHERITED(PresentationRequest, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(PresentationRequest, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(PresentationRequest) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PresentationRequest) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) static nsresult diff --git a/dom/quota/QuotaRequests.cpp b/dom/quota/QuotaRequests.cpp index 369bc790c..a2eef9779 100644 --- a/dom/quota/QuotaRequests.cpp +++ b/dom/quota/QuotaRequests.cpp @@ -147,7 +147,7 @@ UsageRequest::SetResult(nsIVariant* aResult) NS_IMPL_CYCLE_COLLECTION_INHERITED(UsageRequest, RequestBase, mCallback) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(UsageRequest) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(UsageRequest) NS_INTERFACE_MAP_ENTRY(nsIQuotaUsageRequest) NS_INTERFACE_MAP_END_INHERITING(RequestBase) @@ -247,7 +247,7 @@ Request::SetResult() NS_IMPL_CYCLE_COLLECTION_INHERITED(Request, RequestBase, mCallback) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(Request) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Request) NS_INTERFACE_MAP_ENTRY(nsIQuotaRequest) NS_INTERFACE_MAP_END_INHERITING(RequestBase) diff --git a/dom/script/ModuleLoadRequest.cpp b/dom/script/ModuleLoadRequest.cpp index 4fada9b2f..d286476b7 100644 --- a/dom/script/ModuleLoadRequest.cpp +++ b/dom/script/ModuleLoadRequest.cpp @@ -14,7 +14,7 @@ namespace mozilla { namespace dom { -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ModuleLoadRequest) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ModuleLoadRequest) NS_INTERFACE_MAP_END_INHERITING(ScriptLoadRequest) NS_IMPL_CYCLE_COLLECTION_CLASS(ModuleLoadRequest) diff --git a/dom/smil/TimeEvent.cpp b/dom/smil/TimeEvent.cpp index 8a58c6750..72bc34df5 100644 --- a/dom/smil/TimeEvent.cpp +++ b/dom/smil/TimeEvent.cpp @@ -41,7 +41,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(TimeEvent, Event, NS_IMPL_ADDREF_INHERITED(TimeEvent, Event) NS_IMPL_RELEASE_INHERITED(TimeEvent, Event) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TimeEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TimeEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMTimeEvent) NS_INTERFACE_MAP_END_INHERITING(Event) diff --git a/dom/svg/SVGSwitchElement.cpp b/dom/svg/SVGSwitchElement.cpp index a0358dc15..e9da48891 100644 --- a/dom/svg/SVGSwitchElement.cpp +++ b/dom/svg/SVGSwitchElement.cpp @@ -33,7 +33,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(SVGSwitchElement, SVGSwitchElementBase, NS_IMPL_ADDREF_INHERITED(SVGSwitchElement,SVGSwitchElementBase) NS_IMPL_RELEASE_INHERITED(SVGSwitchElement,SVGSwitchElementBase) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(SVGSwitchElement) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SVGSwitchElement) NS_INTERFACE_MAP_END_INHERITING(SVGSwitchElementBase) //---------------------------------------------------------------------- diff --git a/dom/vr/VRDisplay.cpp b/dom/vr/VRDisplay.cpp index f50b289d0..73324b994 100644 --- a/dom/vr/VRDisplay.cpp +++ b/dom/vr/VRDisplay.cpp @@ -596,7 +596,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(VRDisplay, DOMEventTargetHelper, mCapabilitie NS_IMPL_ADDREF_INHERITED(VRDisplay, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(VRDisplay, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(VRDisplay) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(VRDisplay) NS_INTERFACE_MAP_ENTRY(nsIObserver) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, DOMEventTargetHelper) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/workers/ServiceWorker.cpp b/dom/workers/ServiceWorker.cpp index a1b38b248..bd7c9dc59 100644 --- a/dom/workers/ServiceWorker.cpp +++ b/dom/workers/ServiceWorker.cpp @@ -60,7 +60,7 @@ ServiceWorker::~ServiceWorker() NS_IMPL_ADDREF_INHERITED(ServiceWorker, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(ServiceWorker, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServiceWorker) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServiceWorker) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) JSObject* diff --git a/dom/workers/ServiceWorkerContainer.cpp b/dom/workers/ServiceWorkerContainer.cpp index c9737f172..9bf742814 100644 --- a/dom/workers/ServiceWorkerContainer.cpp +++ b/dom/workers/ServiceWorkerContainer.cpp @@ -28,7 +28,7 @@ namespace mozilla { namespace dom { -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServiceWorkerContainer) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServiceWorkerContainer) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(ServiceWorkerContainer, DOMEventTargetHelper) diff --git a/dom/workers/ServiceWorkerEvents.cpp b/dom/workers/ServiceWorkerEvents.cpp index d56328dea..ea9985df5 100644 --- a/dom/workers/ServiceWorkerEvents.cpp +++ b/dom/workers/ServiceWorkerEvents.cpp @@ -880,7 +880,7 @@ NS_IMPL_ISUPPORTS0(WaitUntilHandler) NS_IMPL_ADDREF_INHERITED(FetchEvent, ExtendableEvent) NS_IMPL_RELEASE_INHERITED(FetchEvent, ExtendableEvent) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(FetchEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FetchEvent) NS_INTERFACE_MAP_END_INHERITING(ExtendableEvent) NS_IMPL_CYCLE_COLLECTION_INHERITED(FetchEvent, ExtendableEvent, mRequest) @@ -929,7 +929,7 @@ ExtendableEvent::WaitUntil(JSContext* aCx, Promise& aPromise, ErrorResult& aRv) NS_IMPL_ADDREF_INHERITED(ExtendableEvent, Event) NS_IMPL_RELEASE_INHERITED(ExtendableEvent, Event) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ExtendableEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ExtendableEvent) NS_INTERFACE_MAP_END_INHERITING(Event) namespace { @@ -1120,7 +1120,7 @@ PushEvent::Constructor(mozilla::dom::EventTarget* aOwner, NS_IMPL_ADDREF_INHERITED(PushEvent, ExtendableEvent) NS_IMPL_RELEASE_INHERITED(PushEvent, ExtendableEvent) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(PushEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PushEvent) NS_INTERFACE_MAP_END_INHERITING(ExtendableEvent) NS_IMPL_CYCLE_COLLECTION_INHERITED(PushEvent, ExtendableEvent, mData) @@ -1237,7 +1237,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(ExtendableMessageEvent, Event) NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mData) NS_IMPL_CYCLE_COLLECTION_TRACE_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ExtendableMessageEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ExtendableMessageEvent) NS_INTERFACE_MAP_END_INHERITING(Event) NS_IMPL_ADDREF_INHERITED(ExtendableMessageEvent, Event) diff --git a/dom/workers/ServiceWorkerRegistration.cpp b/dom/workers/ServiceWorkerRegistration.cpp index 9d7c77386..faa01d765 100644 --- a/dom/workers/ServiceWorkerRegistration.cpp +++ b/dom/workers/ServiceWorkerRegistration.cpp @@ -167,7 +167,7 @@ private: NS_IMPL_ADDREF_INHERITED(ServiceWorkerRegistrationMainThread, ServiceWorkerRegistration) NS_IMPL_RELEASE_INHERITED(ServiceWorkerRegistrationMainThread, ServiceWorkerRegistration) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistrationMainThread) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServiceWorkerRegistrationMainThread) NS_INTERFACE_MAP_END_INHERITING(ServiceWorkerRegistration) NS_IMPL_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistrationMainThread, @@ -1055,7 +1055,7 @@ private: NS_IMPL_ADDREF_INHERITED(ServiceWorkerRegistrationWorkerThread, ServiceWorkerRegistration) NS_IMPL_RELEASE_INHERITED(ServiceWorkerRegistrationWorkerThread, ServiceWorkerRegistration) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistrationWorkerThread) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServiceWorkerRegistrationWorkerThread) NS_INTERFACE_MAP_END_INHERITING(ServiceWorkerRegistration) // Expanded macros since we need special behaviour to release the proxy. @@ -1309,7 +1309,7 @@ ServiceWorkerRegistrationWorkerThread::GetPushManager(JSContext* aCx, ErrorResul NS_IMPL_ADDREF_INHERITED(ServiceWorkerRegistration, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(ServiceWorkerRegistration, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistration) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServiceWorkerRegistration) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) ServiceWorkerRegistration::ServiceWorkerRegistration(nsPIDOMWindowInner* aWindow, diff --git a/dom/workers/SharedWorker.cpp b/dom/workers/SharedWorker.cpp index 7a8ab9a3e..f2a2e08ab 100644 --- a/dom/workers/SharedWorker.cpp +++ b/dom/workers/SharedWorker.cpp @@ -169,7 +169,7 @@ SharedWorker::PostMessage(JSContext* aCx, NS_IMPL_ADDREF_INHERITED(SharedWorker, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(SharedWorker, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(SharedWorker) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SharedWorker) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_CLASS(SharedWorker) diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp index ffd216fe9..fa5c6e5d2 100644 --- a/dom/workers/WorkerPrivate.cpp +++ b/dom/workers/WorkerPrivate.cpp @@ -3730,7 +3730,7 @@ template NS_IMPL_RELEASE_INHERITED(WorkerPrivateParent, DOMEventTargetHelper) template -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(WorkerPrivateParent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(WorkerPrivateParent) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) template diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp index 7e7b91e63..8198529ab 100644 --- a/dom/workers/WorkerScope.cpp +++ b/dom/workers/WorkerScope.cpp @@ -560,7 +560,7 @@ SharedWorkerGlobalScope::WrapGlobalObject(JSContext* aCx, NS_IMPL_CYCLE_COLLECTION_INHERITED(ServiceWorkerGlobalScope, WorkerGlobalScope, mClients, mRegistration) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServiceWorkerGlobalScope) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServiceWorkerGlobalScope) NS_INTERFACE_MAP_END_INHERITING(WorkerGlobalScope) NS_IMPL_ADDREF_INHERITED(ServiceWorkerGlobalScope, WorkerGlobalScope) diff --git a/dom/xhr/XMLHttpRequestEventTarget.cpp b/dom/xhr/XMLHttpRequestEventTarget.cpp index b6e65001a..be768fcb7 100644 --- a/dom/xhr/XMLHttpRequestEventTarget.cpp +++ b/dom/xhr/XMLHttpRequestEventTarget.cpp @@ -19,7 +19,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(XMLHttpRequestEventTarget, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(XMLHttpRequestEventTarget) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(XMLHttpRequestEventTarget) NS_INTERFACE_MAP_ENTRY(nsIXMLHttpRequestEventTarget) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/dom/xhr/XMLHttpRequestMainThread.cpp b/dom/xhr/XMLHttpRequestMainThread.cpp index 517351fda..b96cd8feb 100644 --- a/dom/xhr/XMLHttpRequestMainThread.cpp +++ b/dom/xhr/XMLHttpRequestMainThread.cpp @@ -367,7 +367,7 @@ XMLHttpRequestMainThread::IsCertainlyAliveForCC() const } // QueryInterface implementation for XMLHttpRequestMainThread -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(XMLHttpRequestMainThread) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(XMLHttpRequestMainThread) NS_INTERFACE_MAP_ENTRY(nsIXMLHttpRequest) NS_INTERFACE_MAP_ENTRY(nsIJSXMLHttpRequest) NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) diff --git a/dom/xhr/XMLHttpRequestWorker.cpp b/dom/xhr/XMLHttpRequestWorker.cpp index 8b1b88f98..e376e3519 100644 --- a/dom/xhr/XMLHttpRequestWorker.cpp +++ b/dom/xhr/XMLHttpRequestWorker.cpp @@ -1557,7 +1557,7 @@ XMLHttpRequestWorker::~XMLHttpRequestWorker() NS_IMPL_ADDREF_INHERITED(XMLHttpRequestWorker, XMLHttpRequestEventTarget) NS_IMPL_RELEASE_INHERITED(XMLHttpRequestWorker, XMLHttpRequestEventTarget) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(XMLHttpRequestWorker) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(XMLHttpRequestWorker) NS_INTERFACE_MAP_END_INHERITING(XMLHttpRequestEventTarget) NS_IMPL_CYCLE_COLLECTION_CLASS(XMLHttpRequestWorker) diff --git a/dom/xml/nsXMLContentSink.cpp b/dom/xml/nsXMLContentSink.cpp index 779e49dd5..877fe5f70 100644 --- a/dom/xml/nsXMLContentSink.cpp +++ b/dom/xml/nsXMLContentSink.cpp @@ -133,7 +133,7 @@ nsXMLContentSink::Init(nsIDocument* aDoc, return NS_OK; } -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsXMLContentSink) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXMLContentSink) NS_INTERFACE_MAP_ENTRY(nsIContentSink) NS_INTERFACE_MAP_ENTRY(nsIXMLContentSink) NS_INTERFACE_MAP_ENTRY(nsIExpatSink) diff --git a/dom/xml/nsXMLFragmentContentSink.cpp b/dom/xml/nsXMLFragmentContentSink.cpp index 43d81921a..dfad3ee77 100644 --- a/dom/xml/nsXMLFragmentContentSink.cpp +++ b/dom/xml/nsXMLFragmentContentSink.cpp @@ -136,7 +136,7 @@ nsXMLFragmentContentSink::~nsXMLFragmentContentSink() { } -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsXMLFragmentContentSink) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXMLFragmentContentSink) NS_INTERFACE_MAP_ENTRY(nsIFragmentContentSink) NS_INTERFACE_MAP_END_INHERITING(nsXMLContentSink) diff --git a/dom/xul/templates/nsXULTreeBuilder.cpp b/dom/xul/templates/nsXULTreeBuilder.cpp index b42133484..d1d52d939 100644 --- a/dom/xul/templates/nsXULTreeBuilder.cpp +++ b/dom/xul/templates/nsXULTreeBuilder.cpp @@ -283,7 +283,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(nsXULTreeBuilder, nsXULTemplateBuilder, mLocalStore, mObservers) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsXULTreeBuilder) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULTreeBuilder) NS_INTERFACE_MAP_ENTRY(nsIXULTreeBuilder) NS_INTERFACE_MAP_ENTRY(nsITreeView) NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XULTreeBuilder) diff --git a/editor/libeditor/HTMLEditor.cpp b/editor/libeditor/HTMLEditor.cpp index 5f91dffdc..27464975d 100644 --- a/editor/libeditor/HTMLEditor.cpp +++ b/editor/libeditor/HTMLEditor.cpp @@ -238,7 +238,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_ADDREF_INHERITED(HTMLEditor, EditorBase) NS_IMPL_RELEASE_INHERITED(HTMLEditor, EditorBase) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLEditor) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(HTMLEditor) NS_INTERFACE_MAP_ENTRY(nsIHTMLEditor) NS_INTERFACE_MAP_ENTRY(nsIHTMLObjectResizer) NS_INTERFACE_MAP_ENTRY(nsIHTMLAbsPosEditor) diff --git a/editor/libeditor/TextEditor.cpp b/editor/libeditor/TextEditor.cpp index 8b704506f..e9c6a50c6 100644 --- a/editor/libeditor/TextEditor.cpp +++ b/editor/libeditor/TextEditor.cpp @@ -106,7 +106,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_ADDREF_INHERITED(TextEditor, EditorBase) NS_IMPL_RELEASE_INHERITED(TextEditor, EditorBase) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TextEditor) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TextEditor) NS_INTERFACE_MAP_ENTRY(nsIPlaintextEditor) NS_INTERFACE_MAP_ENTRY(nsIEditorMailSupport) NS_INTERFACE_MAP_END_INHERITING(EditorBase) diff --git a/layout/style/CSSStyleSheet.cpp b/layout/style/CSSStyleSheet.cpp index f9d4ddb0f..186402e3d 100644 --- a/layout/style/CSSStyleSheet.cpp +++ b/layout/style/CSSStyleSheet.cpp @@ -516,7 +516,7 @@ CSSStyleSheet::TraverseInner(nsCycleCollectionTraversalCallback &cb) } // QueryInterface implementation for CSSStyleSheet -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(CSSStyleSheet) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CSSStyleSheet) NS_INTERFACE_MAP_ENTRY(nsICSSLoaderObserver) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, StyleSheet) if (aIID.Equals(NS_GET_IID(CSSStyleSheet))) diff --git a/layout/style/FontFaceSet.cpp b/layout/style/FontFaceSet.cpp index b27fb3d9b..8f3bff07a 100644 --- a/layout/style/FontFaceSet.cpp +++ b/layout/style/FontFaceSet.cpp @@ -89,7 +89,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_ADDREF_INHERITED(FontFaceSet, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(FontFaceSet, DOMEventTargetHelper) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(FontFaceSet) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FontFaceSet) NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener) NS_INTERFACE_MAP_ENTRY(nsICSSLoaderObserver) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) diff --git a/layout/style/MediaQueryList.cpp b/layout/style/MediaQueryList.cpp index f4abce3bc..f183b2488 100644 --- a/layout/style/MediaQueryList.cpp +++ b/layout/style/MediaQueryList.cpp @@ -55,7 +55,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(MediaQueryList, DOMEventTargetHe NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaQueryList) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaQueryList) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(MediaQueryList, DOMEventTargetHelper) diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp index e08fb4b43..af505c7e2 100644 --- a/layout/style/StyleRule.cpp +++ b/layout/style/StyleRule.cpp @@ -1294,7 +1294,7 @@ StyleRule::DropReferences() } // QueryInterface implementation for StyleRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(StyleRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(StyleRule) if (aIID.Equals(NS_GET_IID(mozilla::css::StyleRule))) { *aInstancePtr = this; NS_ADDREF_THIS(); diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp index 756368873..00915a4a0 100644 --- a/layout/style/nsCSSRules.cpp +++ b/layout/style/nsCSSRules.cpp @@ -303,7 +303,7 @@ ImportRule::IsCCLeaf() const } // QueryInterface implementation for ImportRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ImportRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ImportRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSImportRule) NS_INTERFACE_MAP_END_INHERITING(Rule) @@ -469,7 +469,7 @@ GroupRule::~GroupRule() NS_IMPL_ADDREF_INHERITED(GroupRule, Rule) NS_IMPL_RELEASE_INHERITED(GroupRule, Rule) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(GroupRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(GroupRule) NS_INTERFACE_MAP_END_INHERITING(Rule) bool @@ -752,7 +752,7 @@ NS_IMPL_ADDREF_INHERITED(MediaRule, ConditionRule) NS_IMPL_RELEASE_INHERITED(MediaRule, ConditionRule) // QueryInterface implementation for MediaRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSGroupingRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSConditionRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSMediaRule) @@ -1677,7 +1677,7 @@ nsCSSFontFaceRule::IsCCLeaf() const } // QueryInterface implementation for nsCSSFontFaceRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsCSSFontFaceRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCSSFontFaceRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSFontFaceRule) NS_INTERFACE_MAP_END_INHERITING(Rule) @@ -2155,7 +2155,7 @@ nsCSSKeyframeRule::IsCCLeaf() const } // QueryInterface implementation for nsCSSKeyframeRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsCSSKeyframeRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCSSKeyframeRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSKeyframeRule) NS_INTERFACE_MAP_END_INHERITING(mozilla::css::Rule) @@ -2674,7 +2674,7 @@ nsCSSPageRule::IsCCLeaf() const } // QueryInterface implementation for nsCSSPageRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsCSSPageRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCSSPageRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSPageRule) NS_INTERFACE_MAP_END_INHERITING(mozilla::css::Rule) @@ -3382,7 +3382,7 @@ CSSLayerStatementRule::IsCCLeaf() const } // QueryInterface implementation for CSSLayerStatementRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(CSSLayerStatementRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CSSLayerStatementRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSLayerStatementRule) NS_INTERFACE_MAP_END_INHERITING(Rule) diff --git a/layout/xul/tree/TreeBoxObject.cpp b/layout/xul/tree/TreeBoxObject.cpp index 87a094f27..72ec065e8 100644 --- a/layout/xul/tree/TreeBoxObject.cpp +++ b/layout/xul/tree/TreeBoxObject.cpp @@ -30,7 +30,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(TreeBoxObject, BoxObject, NS_IMPL_ADDREF_INHERITED(TreeBoxObject, BoxObject) NS_IMPL_RELEASE_INHERITED(TreeBoxObject, BoxObject) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TreeBoxObject) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TreeBoxObject) NS_INTERFACE_MAP_ENTRY(nsITreeBoxObject) NS_INTERFACE_MAP_END_INHERITING(BoxObject) diff --git a/parser/html/nsHtml5DocumentBuilder.cpp b/parser/html/nsHtml5DocumentBuilder.cpp index 65f0dabc8..d29e4f420 100644 --- a/parser/html/nsHtml5DocumentBuilder.cpp +++ b/parser/html/nsHtml5DocumentBuilder.cpp @@ -15,7 +15,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(nsHtml5DocumentBuilder, nsContentSink, mOwnedElements) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsHtml5DocumentBuilder) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsHtml5DocumentBuilder) NS_INTERFACE_MAP_END_INHERITING(nsContentSink) NS_IMPL_ADDREF_INHERITED(nsHtml5DocumentBuilder, nsContentSink) diff --git a/toolkit/components/places/nsNavHistoryResult.cpp b/toolkit/components/places/nsNavHistoryResult.cpp index 1035c9623..8fc0813fd 100644 --- a/toolkit/components/places/nsNavHistoryResult.cpp +++ b/toolkit/components/places/nsNavHistoryResult.cpp @@ -340,7 +340,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(nsNavHistoryContainerResultNode, nsNavHistory NS_IMPL_ADDREF_INHERITED(nsNavHistoryContainerResultNode, nsNavHistoryResultNode) NS_IMPL_RELEASE_INHERITED(nsNavHistoryContainerResultNode, nsNavHistoryResultNode) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsNavHistoryContainerResultNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsNavHistoryContainerResultNode) NS_INTERFACE_MAP_STATIC_AMBIGUOUS(nsNavHistoryContainerResultNode) NS_INTERFACE_MAP_ENTRY(nsINavHistoryContainerResultNode) NS_INTERFACE_MAP_END_INHERITING(nsNavHistoryResultNode) diff --git a/xpcom/glue/nsCycleCollectionParticipant.h b/xpcom/glue/nsCycleCollectionParticipant.h index 0cb42f28d..847a617f2 100644 --- a/xpcom/glue/nsCycleCollectionParticipant.h +++ b/xpcom/glue/nsCycleCollectionParticipant.h @@ -332,9 +332,6 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsXPCOMCycleCollectionParticipant, NS_INTERFACE_MAP_BEGIN(_class) \ NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(_class) -#define NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(_class) \ - NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(_class) - #define NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(_class) \ if (rv == NS_OK) return rv; \ nsISupports* foundInterface; \