author | Andrew McCreight <continuation@gmail.com> |
Tue, 29 Aug 2017 16:02:48 -0700 | |
changeset 427128 | 71882fd33c91d06876715d6ac8b37847c8d14726 |
parent 427127 | a79145d207128d3f40ea956a5eda872a7150cc88 |
child 427129 | 3fe2012dd403392317fdbaec3f4f30672c10839d |
push id | 7761 |
push user | jlund@mozilla.com |
push date | Fri, 15 Sep 2017 00:19:52 +0000 |
treeherder | mozilla-beta@c38455951db4 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | peterv |
bugs | 1391005 |
milestone | 57.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/.clang-format +++ b/.clang-format @@ -9,17 +9,16 @@ PointerAlignment: Left # Prevent the loss of indentation with these macros MacroBlockBegin: "^\ NS_INTERFACE_MAP_BEGIN|\ NS_INTERFACE_TABLE_HEAD|\ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION|\ NS_IMPL_CYCLE_COLLECTION_.*_BEGIN|\ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED|\ -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED|\ NS_INTERFACE_TABLE_BEGIN|\ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED|\ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED$" MacroBlockEnd: "^\ NS_INTERFACE_MAP_END|\ NS_IMPL_CYCLE_COLLECTION_.*_END|\ NS_INTERFACE_TABLE_END|\ NS_INTERFACE_MAP_END_INHERITING|\
--- a/accessible/generic/DocAccessible.cpp +++ b/accessible/generic/DocAccessible.cpp @@ -158,17 +158,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN tmp->mDependentIDsHash.Clear(); tmp->mNodeToAccessibleMap.Clear(); NS_IMPL_CYCLE_COLLECTION_UNLINK(mAccessibleCache) NS_IMPL_CYCLE_COLLECTION_UNLINK(mAnchorJumpElm) NS_IMPL_CYCLE_COLLECTION_UNLINK(mInvalidationList) 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) NS_INTERFACE_MAP_ENTRY(nsIObserver) NS_INTERFACE_MAP_ENTRY(nsIAccessiblePivotObserver) NS_INTERFACE_MAP_END_INHERITING(HyperTextAccessible) NS_IMPL_ADDREF_INHERITED(DocAccessible, HyperTextAccessible)
--- a/accessible/xul/XULTreeAccessible.cpp +++ b/accessible/xul/XULTreeAccessible.cpp @@ -69,17 +69,17 @@ XULTreeAccessible::~XULTreeAccessible() } //////////////////////////////////////////////////////////////////////////////// // XULTreeAccessible: nsISupports and cycle collection implementation 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) NS_IMPL_RELEASE_INHERITED(XULTreeAccessible, Accessible) //////////////////////////////////////////////////////////////////////////////// // XULTreeAccessible: Accessible implementation @@ -1081,17 +1081,17 @@ XULTreeItemAccessible::~XULTreeItemAcces //////////////////////////////////////////////////////////////////////////////// // XULTreeItemAccessible: nsISupports implementation 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) //////////////////////////////////////////////////////////////////////////////// // XULTreeItemAccessible: nsIAccessible implementation ENameValueFlag
--- a/accessible/xul/XULTreeGridAccessible.cpp +++ b/accessible/xul/XULTreeGridAccessible.cpp @@ -258,17 +258,17 @@ XULTreeGridRowAccessible::~XULTreeGridRo //////////////////////////////////////////////////////////////////////////////// // XULTreeGridRowAccessible: nsISupports and cycle collection implementation 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, XULTreeItemAccessibleBase) NS_IMPL_RELEASE_INHERITED(XULTreeGridRowAccessible, XULTreeItemAccessibleBase) //////////////////////////////////////////////////////////////////////////////// @@ -442,17 +442,17 @@ XULTreeGridCellAccessible::~XULTreeGridC } //////////////////////////////////////////////////////////////////////////////// // XULTreeGridCellAccessible: nsISupports implementation 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) //////////////////////////////////////////////////////////////////////////////// // XULTreeGridCellAccessible: Accessible void
--- a/dom/abort/AbortSignal.cpp +++ b/dom/abort/AbortSignal.cpp @@ -18,17 +18,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mController) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(AbortSignal, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_UNLINK(mController) 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) NS_IMPL_RELEASE_INHERITED(AbortSignal, DOMEventTargetHelper) AbortSignal::AbortSignal(AbortController* aController, bool aAborted) : DOMEventTargetHelper(aController->GetParentObject())
--- a/dom/animation/Animation.cpp +++ b/dom/animation/Animation.cpp @@ -32,17 +32,17 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(Anima mTimeline, mEffect, mReady, mFinished) 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* Animation::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) { return dom::AnimationBinding::Wrap(aCx, this, aGivenProto); }
--- a/dom/animation/DocumentTimeline.cpp +++ b/dom/animation/DocumentTimeline.cpp @@ -30,17 +30,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ AnimationTimeline) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDocument) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END 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) NS_IMPL_RELEASE_INHERITED(DocumentTimeline, AnimationTimeline) JSObject* DocumentTimeline::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) {
--- a/dom/animation/KeyframeEffectReadOnly.cpp +++ b/dom/animation/KeyframeEffectReadOnly.cpp @@ -54,17 +54,17 @@ namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(KeyframeEffectReadOnly, AnimationEffectReadOnly, mTarget) 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) NS_IMPL_RELEASE_INHERITED(KeyframeEffectReadOnly, AnimationEffectReadOnly) KeyframeEffectReadOnly::KeyframeEffectReadOnly( nsIDocument* aDocument, const Maybe<OwningAnimationTarget>& aTarget,
--- a/dom/base/DOMCursor.cpp +++ b/dom/base/DOMCursor.cpp @@ -8,17 +8,17 @@ #include "mozilla/dom/DOMCursorBinding.h" namespace mozilla { 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) NS_IMPL_ADDREF_INHERITED(DOMCursor, DOMRequest) NS_IMPL_RELEASE_INHERITED(DOMCursor, DOMRequest) DOMCursor::DOMCursor(nsPIDOMWindowInner* aWindow, nsICursorContinueCallback* aCallback) : DOMRequest(aWindow)
--- a/dom/base/DOMQuad.cpp +++ b/dom/base/DOMQuad.cpp @@ -139,17 +139,17 @@ public: protected: virtual ~QuadBounds() {} RefPtr<DOMQuad> mQuad; }; NS_IMPL_CYCLE_COLLECTION_INHERITED(DOMQuad::QuadBounds, DOMRectReadOnly, mQuad) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DOMQuad::QuadBounds) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMQuad::QuadBounds) NS_INTERFACE_MAP_END_INHERITING(DOMRectReadOnly) NS_IMPL_ADDREF_INHERITED(DOMQuad::QuadBounds, DOMRectReadOnly) NS_IMPL_RELEASE_INHERITED(DOMQuad::QuadBounds, DOMRectReadOnly) DOMRectReadOnly* DOMQuad::Bounds() const {
--- a/dom/base/DOMRequest.cpp +++ b/dom/base/DOMRequest.cpp @@ -62,17 +62,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(DOMRequest, DOMEventTargetHelper) // Don't need NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER because // DOMEventTargetHelper does it for us. 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) NS_IMPL_ADDREF_INHERITED(DOMRequest, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(DOMRequest, DOMEventTargetHelper) /* virtual */ JSObject* DOMRequest::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
--- a/dom/base/EventSource.cpp +++ b/dom/base/EventSource.cpp @@ -2055,16 +2055,16 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN NS_IMPL_CYCLE_COLLECTION_UNLINK_END bool 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) NS_IMPL_RELEASE_INHERITED(EventSource, DOMEventTargetHelper) } // namespace dom } // namespace mozilla
--- a/dom/base/ScreenOrientation.cpp +++ b/dom/base/ScreenOrientation.cpp @@ -19,17 +19,17 @@ using namespace mozilla; using namespace mozilla::dom; 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) NS_IMPL_RELEASE_INHERITED(ScreenOrientation, DOMEventTargetHelper) static OrientationType InternalOrientationToType(ScreenOrientationInternal aOrientation) {
--- a/dom/base/ShadowRoot.cpp +++ b/dom/base/ShadowRoot.cpp @@ -46,17 +46,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN NS_IMPL_CYCLE_COLLECTION_UNLINK(mPoolHost) NS_IMPL_CYCLE_COLLECTION_UNLINK(mStyleSheetList) NS_IMPL_CYCLE_COLLECTION_UNLINK(mOlderShadow) NS_IMPL_CYCLE_COLLECTION_UNLINK(mYoungerShadow) NS_IMPL_CYCLE_COLLECTION_UNLINK(mAssociatedBinding) tmp->mIdentifierMap.Clear(); NS_IMPL_CYCLE_COLLECTION_UNLINK_END -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) NS_IMPL_ADDREF_INHERITED(ShadowRoot, DocumentFragment) NS_IMPL_RELEASE_INHERITED(ShadowRoot, DocumentFragment) ShadowRoot::ShadowRoot(nsIContent* aContent, @@ -724,17 +724,17 @@ ShadowRoot::DestroyContent() mOlderShadow->DestroyContent(); } DocumentFragment::DestroyContent(); } NS_IMPL_CYCLE_COLLECTION_INHERITED(ShadowRootStyleSheetList, StyleSheetList, mShadowRoot) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ShadowRootStyleSheetList) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ShadowRootStyleSheetList) NS_INTERFACE_MAP_END_INHERITING(StyleSheetList) NS_IMPL_ADDREF_INHERITED(ShadowRootStyleSheetList, StyleSheetList) NS_IMPL_RELEASE_INHERITED(ShadowRootStyleSheetList, StyleSheetList) ShadowRootStyleSheetList::ShadowRootStyleSheetList(ShadowRoot* aShadowRoot) : mShadowRoot(aShadowRoot) {
--- a/dom/base/WebSocket.cpp +++ b/dom/base/WebSocket.cpp @@ -1462,17 +1462,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN NS_IMPL_CYCLE_COLLECTION_UNLINK_END bool 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) NS_IMPL_RELEASE_INHERITED(WebSocket, DOMEventTargetHelper) void WebSocket::DisconnectFromOwner() {
--- a/dom/base/nsContentIterator.cpp +++ b/dom/base/nsContentIterator.cpp @@ -1285,17 +1285,17 @@ protected: // these arrays all typically are used and have elements AutoTArray<nsIContent*, 8> mEndNodes; AutoTArray<int32_t, 8> mEndOffsets; }; 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, mRange) void nsContentSubtreeIterator::LastRelease() {
--- a/dom/base/nsContentList.cpp +++ b/dom/base/nsContentList.cpp @@ -134,32 +134,32 @@ int32_t nsBaseContentList::IndexOf(nsIContent* aContent) { return IndexOf(aContent, true); } 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) NS_IMPL_ADDREF_INHERITED(nsSimpleContentList, nsBaseContentList) NS_IMPL_RELEASE_INHERITED(nsSimpleContentList, nsBaseContentList) JSObject* nsSimpleContentList::WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto) { return NodeListBinding::Wrap(cx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_INHERITED(nsEmptyContentList, nsBaseContentList, mRoot) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsEmptyContentList) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsEmptyContentList) NS_INTERFACE_MAP_END_INHERITING(nsBaseContentList) NS_IMPL_ADDREF_INHERITED(nsEmptyContentList, nsBaseContentList) NS_IMPL_RELEASE_INHERITED(nsEmptyContentList, nsBaseContentList) JSObject* nsEmptyContentList::WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto)
--- a/dom/base/nsDOMDataChannel.cpp +++ b/dom/base/nsDOMDataChannel.cpp @@ -63,17 +63,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsDOMDataChannel, DOMEventTargetHelper) 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) nsDOMDataChannel::nsDOMDataChannel(already_AddRefed<mozilla::DataChannel>& aDataChannel, nsPIDOMWindowInner* aWindow) : DOMEventTargetHelper(aWindow) , mDataChannel(aDataChannel) , mBinaryType(DC_BINARY_TYPE_BLOB)
--- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -13991,17 +13991,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN NS_IMPL_CYCLE_COLLECTION_UNLINK(mMessageManager) } tmp->DisconnectAndClearGroupMessageManagers(); NS_IMPL_CYCLE_COLLECTION_UNLINK(mGroupMessageManagers) NS_IMPL_CYCLE_COLLECTION_UNLINK(mOpenerForInitialContentBrowser) 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) NS_IMPL_ADDREF_INHERITED(nsGlobalChromeWindow, nsGlobalWindow) NS_IMPL_RELEASE_INHERITED(nsGlobalChromeWindow, nsGlobalWindow) /* static */ already_AddRefed<nsGlobalChromeWindow> nsGlobalChromeWindow::Create(nsGlobalWindow *aOuterWindow)
--- a/dom/base/nsInProcessTabChildGlobal.cpp +++ b/dom/base/nsInProcessTabChildGlobal.cpp @@ -153,17 +153,17 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsInProcessTabChildGlobal, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_UNLINK(mMessageManager) tmp->nsMessageManagerScriptExecutor::Unlink(); 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) NS_INTERFACE_MAP_ENTRY(nsIContentFrameMessageManager) NS_INTERFACE_MAP_ENTRY(nsIInProcessContentFrameMessageManager) NS_INTERFACE_MAP_ENTRY(nsIScriptObjectPrincipal) NS_INTERFACE_MAP_ENTRY(nsIGlobalObject) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
--- a/dom/base/nsScreen.cpp +++ b/dom/base/nsScreen.cpp @@ -45,17 +45,17 @@ nsScreen::nsScreen(nsPIDOMWindowInner* a } 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) NS_IMPL_ADDREF_INHERITED(nsScreen, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(nsScreen, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_INHERITED(nsScreen, DOMEventTargetHelper,
--- a/dom/bindings/Codegen.py +++ b/dom/bindings/Codegen.py @@ -15471,17 +15471,17 @@ class CGJSImplClass(CGBindingImplClass): // And that our ancestor has not called SetIsNotDOMBinding() MOZ_ASSERT(IsDOMBinding()); """) extradefinitions = fill( """ 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, parentClass=parentClass) else: baseClasses = [ClassBase("nsSupportsWeakReference"), ClassBase("nsWrapperCache")] isupportsDecl = "NS_DECL_CYCLE_COLLECTING_ISUPPORTS\n" @@ -17749,17 +17749,17 @@ class CGEventClass(CGBindingImplClass): NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(${nativeType}, ${parentType}) $*{trace} NS_IMPL_CYCLE_COLLECTION_TRACE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(${nativeType}, ${parentType}) $*{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) : ${parentType}(${ctorParams}) { } ${nativeType}::~${nativeType}()
--- a/dom/broadcastchannel/BroadcastChannel.cpp +++ b/dom/broadcastchannel/BroadcastChannel.cpp @@ -559,17 +559,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(BroadcastChannel, DOMEventTargetHelper) 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) NS_IMPL_ADDREF_INHERITED(BroadcastChannel, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(BroadcastChannel, DOMEventTargetHelper) } // namespace dom
--- a/dom/canvas/OffscreenCanvas.cpp +++ b/dom/canvas/OffscreenCanvas.cpp @@ -358,14 +358,14 @@ OffscreenCanvas::PrefEnabledOnWorkerThre return PrefEnabled(aCx, aObj); } NS_IMPL_CYCLE_COLLECTION_INHERITED(OffscreenCanvas, DOMEventTargetHelper, mCurrentContext) 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) } // namespace dom } // namespace mozilla
--- a/dom/events/CompositionEvent.cpp +++ b/dom/events/CompositionEvent.cpp @@ -57,17 +57,17 @@ CompositionEvent::Constructor(const Glob } NS_IMPL_CYCLE_COLLECTION_INHERITED(CompositionEvent, UIEvent, mRanges) NS_IMPL_ADDREF_INHERITED(CompositionEvent, UIEvent) NS_IMPL_RELEASE_INHERITED(CompositionEvent, UIEvent) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(CompositionEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CompositionEvent) NS_INTERFACE_MAP_END_INHERITING(UIEvent) void CompositionEvent::GetData(nsAString& aData) const { aData = mData; }
--- a/dom/events/CustomEvent.cpp +++ b/dom/events/CustomEvent.cpp @@ -39,17 +39,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(CustomEvent, Event) NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mDetail) 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) already_AddRefed<CustomEvent> CustomEvent::Constructor(const GlobalObject& aGlobal, const nsAString& aType, const CustomEventInit& aParam, ErrorResult& aRv)
--- a/dom/events/DeviceMotionEvent.cpp +++ b/dom/events/DeviceMotionEvent.cpp @@ -17,17 +17,17 @@ namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(DeviceMotionEvent, Event, mAcceleration, mAccelerationIncludingGravity, mRotationRate) 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 DeviceMotionEvent::InitDeviceMotionEvent( const nsAString& aType, bool aCanBubble, bool aCancelable, const DeviceAccelerationInit& aAcceleration,
--- a/dom/events/MessageEvent.cpp +++ b/dom/events/MessageEvent.cpp @@ -33,17 +33,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mServiceWorkerSource) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPorts) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END 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) NS_IMPL_RELEASE_INHERITED(MessageEvent, Event) MessageEvent::MessageEvent(EventTarget* aOwner, nsPresContext* aPresContext, WidgetEvent* aEvent)
--- a/dom/events/ScrollAreaEvent.cpp +++ b/dom/events/ScrollAreaEvent.cpp @@ -23,17 +23,17 @@ ScrollAreaEvent::ScrollAreaEvent(EventTa } NS_IMPL_CYCLE_COLLECTION_INHERITED(ScrollAreaEvent, UIEvent, mClientArea) NS_IMPL_ADDREF_INHERITED(ScrollAreaEvent, UIEvent) NS_IMPL_RELEASE_INHERITED(ScrollAreaEvent, UIEvent) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ScrollAreaEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ScrollAreaEvent) NS_INTERFACE_MAP_END_INHERITING(UIEvent) void ScrollAreaEvent::InitScrollAreaEvent(const nsAString& aEventType, bool aCanBubble, bool aCancelable, nsGlobalWindow* aView, int32_t aDetail,
--- a/dom/events/StorageEvent.cpp +++ b/dom/events/StorageEvent.cpp @@ -21,17 +21,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(StorageEvent, Event) NS_IMPL_CYCLE_COLLECTION_TRACE_END 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) : Event(aOwner, nullptr, nullptr) { } StorageEvent::~StorageEvent()
--- a/dom/events/TouchEvent.cpp +++ b/dom/events/TouchEvent.cpp @@ -69,17 +69,17 @@ TouchEvent::TouchEvent(EventTarget* aOwn } } NS_IMPL_CYCLE_COLLECTION_INHERITED(TouchEvent, UIEvent, mTouches, 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) NS_IMPL_RELEASE_INHERITED(TouchEvent, UIEvent) void TouchEvent::InitTouchEvent(const nsAString& aType, bool aCanBubble,
--- a/dom/events/UIEvent.cpp +++ b/dom/events/UIEvent.cpp @@ -95,17 +95,17 @@ UIEvent::Constructor(const GlobalObject& } NS_IMPL_CYCLE_COLLECTION_INHERITED(UIEvent, Event, mView) 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) static nsIntPoint DevPixelsToCSSPixels(const LayoutDeviceIntPoint& aPoint, nsPresContext* aContext) { return nsIntPoint(aContext->DevPixelsToIntCSSPixels(aPoint.x),
--- a/dom/events/XULCommandEvent.cpp +++ b/dom/events/XULCommandEvent.cpp @@ -27,17 +27,17 @@ XULCommandEvent::XULCommandEvent(EventTa } NS_IMPL_ADDREF_INHERITED(XULCommandEvent, UIEvent) 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) bool XULCommandEvent::AltKey() { return mEvent->AsInputEvent()->IsAlt(); }
--- a/dom/fetch/FetchObserver.cpp +++ b/dom/fetch/FetchObserver.cpp @@ -15,17 +15,17 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(FetchObse NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(FetchObserver, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END 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) NS_IMPL_RELEASE_INHERITED(FetchObserver, DOMEventTargetHelper) /* static */ bool FetchObserver::IsEnabled(JSContext* aCx, JSObject* aGlobal) {
--- a/dom/file/FileReader.cpp +++ b/dom/file/FileReader.cpp @@ -62,17 +62,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN NS_IMPL_CYCLE_COLLECTION_UNLINK(mError) NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(FileReader, DOMEventTargetHelper) 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) NS_INTERFACE_MAP_ENTRY(nsINamed) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(FileReader, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(FileReader, DOMEventTargetHelper)
--- a/dom/filesystem/compat/FileSystemDirectoryEntry.cpp +++ b/dom/filesystem/compat/FileSystemDirectoryEntry.cpp @@ -15,17 +15,17 @@ namespace mozilla { namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(FileSystemDirectoryEntry, FileSystemEntry, mDirectory) 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, Directory* aDirectory, FileSystemDirectoryEntry* aParentEntry, FileSystem* aFileSystem) : FileSystemEntry(aGlobal, aParentEntry, aFileSystem) , mDirectory(aDirectory)
--- a/dom/filesystem/compat/FileSystemFileEntry.cpp +++ b/dom/filesystem/compat/FileSystemFileEntry.cpp @@ -47,17 +47,17 @@ private: } // anonymous namespace 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, File* aFile, FileSystemDirectoryEntry* aParentEntry, FileSystem* aFileSystem) : FileSystemEntry(aGlobal, aParentEntry, aFileSystem) , mFile(aFile)
--- a/dom/filesystem/compat/FileSystemRootDirectoryEntry.cpp +++ b/dom/filesystem/compat/FileSystemRootDirectoryEntry.cpp @@ -12,17 +12,17 @@ namespace mozilla { namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(FileSystemRootDirectoryEntry, FileSystemDirectoryEntry, mEntries) 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, const Sequence<RefPtr<FileSystemEntry>>& aEntries, FileSystem* aFileSystem) : FileSystemDirectoryEntry(aGlobal, nullptr, nullptr, aFileSystem) , mEntries(aEntries) {
--- a/dom/filesystem/compat/FileSystemRootDirectoryReader.cpp +++ b/dom/filesystem/compat/FileSystemRootDirectoryReader.cpp @@ -50,17 +50,17 @@ private: NS_IMPL_CYCLE_COLLECTION_INHERITED(FileSystemRootDirectoryReader, FileSystemDirectoryReader, mEntries) NS_IMPL_ADDREF_INHERITED(FileSystemRootDirectoryReader, FileSystemDirectoryReader) 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, FileSystem* aFileSystem, const Sequence<RefPtr<FileSystemEntry>>& aEntries) : FileSystemDirectoryReader(aParentEntry, aFileSystem, nullptr) , mEntries(aEntries) , mAlreadyRead(false)
--- a/dom/flyweb/FlyWebServerEvents.cpp +++ b/dom/flyweb/FlyWebServerEvents.cpp @@ -30,17 +30,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(FlyWebFetchEvent, Event) NS_IMPL_CYCLE_COLLECTION_TRACE_END 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, class Request* aRequest, InternalRequest* aInternalRequest) : Event(aServer, nullptr, nullptr) , mRequest(aRequest) , mInternalRequest(aInternalRequest)
--- a/dom/gamepad/GamepadServiceTest.cpp +++ b/dom/gamepad/GamepadServiceTest.cpp @@ -38,17 +38,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindow) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(GamepadServiceTest, DOMEventTargetHelper) 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) NS_IMPL_ADDREF_INHERITED(GamepadServiceTest, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(GamepadServiceTest, DOMEventTargetHelper) // static already_AddRefed<GamepadServiceTest>
--- a/dom/html/HTMLCanvasElement.cpp +++ b/dom/html/HTMLCanvasElement.cpp @@ -710,17 +710,17 @@ private: RefPtr<CanvasCaptureMediaStream> mCaptureStream; }; 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, mCaptureStream) already_AddRefed<CanvasCaptureMediaStream> HTMLCanvasElement::CaptureStream(const Optional<double>& aFrameRate, ErrorResult& aRv)
--- a/dom/html/HTMLContentElement.cpp +++ b/dom/html/HTMLContentElement.cpp @@ -54,17 +54,17 @@ HTMLContentElement::~HTMLContentElement( NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLContentElement, nsGenericHTMLElement, mMatchedNodes) NS_IMPL_ADDREF_INHERITED(HTMLContentElement, Element) NS_IMPL_RELEASE_INHERITED(HTMLContentElement, Element) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLContentElement) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(HTMLContentElement) NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement) NS_IMPL_ELEMENT_CLONE(HTMLContentElement) JSObject* HTMLContentElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto) { return HTMLContentElementBinding::Wrap(aCx, this, aGivenProto);
--- a/dom/html/HTMLDataListElement.cpp +++ b/dom/html/HTMLDataListElement.cpp @@ -23,17 +23,17 @@ HTMLDataListElement::WrapNode(JSContext } NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLDataListElement, nsGenericHTMLElement, mOptions) 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) NS_IMPL_ELEMENT_CLONE(HTMLDataListElement) bool HTMLDataListElement::MatchOptions(Element* aElement, int32_t aNamespaceID, nsIAtom* aAtom, void* aData)
--- a/dom/html/HTMLMediaElement.cpp +++ b/dom/html/HTMLMediaElement.cpp @@ -1469,17 +1469,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN NS_IMPL_CYCLE_COLLECTION_UNLINK(mAudioTrackList) NS_IMPL_CYCLE_COLLECTION_UNLINK(mVideoTrackList) NS_IMPL_CYCLE_COLLECTION_UNLINK(mMediaKeys) NS_IMPL_CYCLE_COLLECTION_UNLINK(mSelectedVideoStreamTrack) NS_IMPL_CYCLE_COLLECTION_UNLINK(mPendingPlayPromises) NS_IMPL_CYCLE_COLLECTION_UNLINK(mSeekDOMPromise) 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) // nsIDOMHTMLMediaElement NS_IMPL_URI_ATTR(HTMLMediaElement, Src, src) NS_IMPL_BOOL_ATTR(HTMLMediaElement, Controls, controls) NS_IMPL_BOOL_ATTR(HTMLMediaElement, Autoplay, autoplay) NS_IMPL_BOOL_ATTR(HTMLMediaElement, Loop, loop) @@ -3163,17 +3163,17 @@ private: RefPtr<DOMMediaStream> mOwningStream; TrackID mDestinationTrackID; }; 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, mElement, mCapturedTrackSource, mOwningStream) class HTMLMediaElement::DecoderCaptureTrackSource : @@ -3242,17 +3242,17 @@ protected: RefPtr<HTMLMediaElement> mElement; }; 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, mElement) class HTMLMediaElement::CaptureStreamTrackSourceGetter : public MediaStreamTrackSourceGetter { @@ -3286,17 +3286,17 @@ protected: RefPtr<HTMLMediaElement> mElement; }; 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, mElement) void HTMLMediaElement::SetCapturedOutputStreamsEnabled(bool aEnabled) { for (OutputMediaStream& ms : mOutputStreams) {
--- a/dom/html/HTMLShadowElement.cpp +++ b/dom/html/HTMLShadowElement.cpp @@ -61,17 +61,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN tmp->mProjectedShadow->RemoveMutationObserver(tmp); tmp->mProjectedShadow = nullptr; } NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_ADDREF_INHERITED(HTMLShadowElement, Element) NS_IMPL_RELEASE_INHERITED(HTMLShadowElement, Element) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLShadowElement) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(HTMLShadowElement) NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement) NS_IMPL_ELEMENT_CLONE(HTMLShadowElement) JSObject* HTMLShadowElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto) { return HTMLShadowElementBinding::Wrap(aCx, this, aGivenProto);
--- a/dom/html/HTMLSourceElement.cpp +++ b/dom/html/HTMLSourceElement.cpp @@ -34,17 +34,17 @@ HTMLSourceElement::~HTMLSourceElement() } NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLSourceElement, nsGenericHTMLElement, mSrcMediaSource) 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) NS_IMPL_ELEMENT_CLONE(HTMLSourceElement) NS_IMPL_URI_ATTR(HTMLSourceElement, Src, src) NS_IMPL_STRING_ATTR(HTMLSourceElement, Type, type) NS_IMPL_STRING_ATTR(HTMLSourceElement, Srcset, srcset)
--- a/dom/html/HTMLTableElement.cpp +++ b/dom/html/HTMLTableElement.cpp @@ -612,17 +612,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTBodies) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mRows) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END 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) NS_IMPL_ELEMENT_CLONE(HTMLTableElement) // the DOM spec says border, cellpadding, cellSpacing are all "wstring" // in fact, they are integers or they are meaningless. so we store them
--- a/dom/html/HTMLTableRowElement.cpp +++ b/dom/html/HTMLTableRowElement.cpp @@ -35,17 +35,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ nsGenericHTMLElement) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCells) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END 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) NS_IMPL_ELEMENT_CLONE(HTMLTableRowElement) // protected method HTMLTableSectionElement*
--- a/dom/html/HTMLTableSectionElement.cpp +++ b/dom/html/HTMLTableSectionElement.cpp @@ -35,17 +35,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ nsGenericHTMLElement) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mRows) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END 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) NS_IMPL_ELEMENT_CLONE(HTMLTableSectionElement) nsIHTMLCollection* HTMLTableSectionElement::Rows() {
--- a/dom/html/HTMLTemplateElement.cpp +++ b/dom/html/HTMLTemplateElement.cpp @@ -52,17 +52,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(HTMLTemplateElement, nsGenericHTMLElement) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mContent) 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) JSObject* HTMLTemplateElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto) { return HTMLTemplateElementBinding::Wrap(aCx, this, aGivenProto);
--- a/dom/html/HTMLTrackElement.cpp +++ b/dom/html/HTMLTrackElement.cpp @@ -147,17 +147,17 @@ HTMLTrackElement::~HTMLTrackElement() NS_IMPL_ELEMENT_CLONE(HTMLTrackElement) NS_IMPL_ADDREF_INHERITED(HTMLTrackElement, Element) 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 HTMLTrackElement::GetKind(DOMString& aKind) const { GetEnumAttr(nsGkAtoms::kind, kKindTable[0].tag, aKind); }
--- a/dom/indexedDB/IDBDatabase.cpp +++ b/dom/indexedDB/IDBDatabase.cpp @@ -1169,17 +1169,17 @@ IDBDatabase::LogWarning(const char* aMes nsIScriptError::warningFlag, mFactory->IsChrome(), mFactory->InnerWindowID()); } 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) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(IDBDatabase, IDBWrapperCache) tmp->AssertIsOnOwningThread(); NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFactory) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
--- a/dom/indexedDB/IDBFileHandle.cpp +++ b/dom/indexedDB/IDBFileHandle.cpp @@ -740,17 +740,17 @@ IDBFileHandle::SendAbort() #ifdef DEBUG mSentFinishOrAbort = true; #endif } 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) NS_IMPL_CYCLE_COLLECTION_CLASS(IDBFileHandle) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(IDBFileHandle, DOMEventTargetHelper)
--- a/dom/indexedDB/IDBFileRequest.cpp +++ b/dom/indexedDB/IDBFileRequest.cpp @@ -96,17 +96,17 @@ IDBFileRequest::SetResultCallback(Result } else { FireSuccess(result); } } 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, mFileHandle) nsresult IDBFileRequest::GetEventTargetParent(EventChainPreVisitor& aVisitor) {
--- a/dom/indexedDB/IDBMutableFile.cpp +++ b/dom/indexedDB/IDBMutableFile.cpp @@ -222,17 +222,17 @@ IDBMutableFile::GetFile(ErrorResult& aEr fileHandle->StartRequest(request, params); return request.forget(); } 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) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(IDBMutableFile, DOMEventTargetHelper) tmp->AssertIsOnOwningThread(); NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDatabase)
--- a/dom/indexedDB/IDBRequest.cpp +++ b/dom/indexedDB/IDBRequest.cpp @@ -391,17 +391,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(IDBRequest, IDBWrapperCache) // Don't need NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER because // DOMEventTargetHelper does it for us. 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 NS_INTERFACE_MAP_END_INHERITING(IDBWrapperCache) NS_IMPL_ADDREF_INHERITED(IDBRequest, IDBWrapperCache) NS_IMPL_RELEASE_INHERITED(IDBRequest, IDBWrapperCache) @@ -630,17 +630,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFactory) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(IDBOpenDBRequest, IDBRequest) // 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) NS_IMPL_RELEASE_INHERITED(IDBOpenDBRequest, IDBRequest) nsresult IDBOpenDBRequest::PostHandleEvent(EventChainPostVisitor& aVisitor) {
--- a/dom/indexedDB/IDBTransaction.cpp +++ b/dom/indexedDB/IDBTransaction.cpp @@ -1003,17 +1003,17 @@ IDBTransaction::ObjectStore(const nsAStr } return objectStore.forget(); } 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) NS_IMPL_CYCLE_COLLECTION_CLASS(IDBTransaction) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(IDBTransaction, IDBWrapperCache) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDatabase)
--- a/dom/indexedDB/IDBWrapperCache.cpp +++ b/dom/indexedDB/IDBWrapperCache.cpp @@ -30,17 +30,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(IDBWrapperCache, DOMEventTargetHelper) // Don't need NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER because // DOMEventTargetHelper does it for us. 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) NS_IMPL_RELEASE_INHERITED(IDBWrapperCache, DOMEventTargetHelper) IDBWrapperCache::IDBWrapperCache(DOMEventTargetHelper* aOwner) : DOMEventTargetHelper(aOwner), mScriptOwner(nullptr) { }
--- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -696,17 +696,17 @@ TabChild::UpdateFrameType() nsCOMPtr<nsIDocShell> docShell = do_GetInterface(WebNavigation()); MOZ_ASSERT(docShell); // TODO: Bug 1252794 - remove frameType from nsIDocShell.idl docShell->SetFrameType(IsMozBrowserElement() ? nsIDocShell::FRAME_TYPE_BROWSER : 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) NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChromeFocus) NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor) NS_INTERFACE_MAP_ENTRY(nsIWindowProvider) NS_INTERFACE_MAP_ENTRY(nsITabChild) NS_INTERFACE_MAP_ENTRY(nsIObserver) @@ -3617,17 +3617,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(TabChildGlobal, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMessageManager) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTabChild) 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) NS_INTERFACE_MAP_ENTRY(nsIContentFrameMessageManager) NS_INTERFACE_MAP_ENTRY(nsIScriptObjectPrincipal) NS_INTERFACE_MAP_ENTRY(nsIGlobalObject) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ContentFrameMessageManager)
--- a/dom/media/CanvasCaptureMediaStream.cpp +++ b/dom/media/CanvasCaptureMediaStream.cpp @@ -215,17 +215,17 @@ protected: // ---------------------------------------------------------------------- NS_IMPL_CYCLE_COLLECTION_INHERITED(CanvasCaptureMediaStream, DOMMediaStream, mCanvas) 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, HTMLCanvasElement* aCanvas) : DOMMediaStream(aWindow, nullptr) , mCanvas(aCanvas) , mOutputStreamDriver(nullptr) {
--- a/dom/media/DOMMediaStream.cpp +++ b/dom/media/DOMMediaStream.cpp @@ -363,17 +363,17 @@ protected: RefPtr<DOMMediaStream> mStream; }; 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, mStream) NS_IMPL_CYCLE_COLLECTION_CLASS(DOMMediaStream) NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(DOMMediaStream, @@ -399,34 +399,34 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPlaybackTrackListener) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPrincipal) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mVideoPrincipal) 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) NS_IMPL_ADDREF_INHERITED(DOMLocalMediaStream, DOMMediaStream) NS_IMPL_RELEASE_INHERITED(DOMLocalMediaStream, DOMMediaStream) NS_INTERFACE_MAP_BEGIN(DOMLocalMediaStream) NS_INTERFACE_MAP_ENTRY(DOMLocalMediaStream) NS_INTERFACE_MAP_END_INHERITING(DOMMediaStream) NS_IMPL_CYCLE_COLLECTION_INHERITED(DOMAudioNodeMediaStream, DOMMediaStream, mStreamNode) 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, MediaStreamTrackSourceGetter* aTrackSourceGetter) : mLogicalStreamStartTime(0), mWindow(aWindow), mInputStream(nullptr), mOwnedStream(nullptr), mPlaybackStream(nullptr), mTracksPendingRemoval(0), mTrackSourceGetter(aTrackSourceGetter), mPlaybackTrackListener(MakeAndAddRef<PlaybackTrackListener>(this)), @@ -721,17 +721,17 @@ protected: RefPtr<DOMMediaStream> mStream; }; 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, mStream) already_AddRefed<DOMMediaStream> DOMMediaStream::Clone() {
--- a/dom/media/MediaManager.cpp +++ b/dom/media/MediaManager.cpp @@ -947,17 +947,17 @@ public: protected: virtual ~FakeTrackSourceGetter() {} nsCOMPtr<nsIPrincipal> mPrincipal; }; 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, mPrincipal) /** * Creates a MediaStream, attaches a listener and fires off a success callback * to the DOM with the stream. We also pass in the error callback so it can
--- a/dom/media/MediaRecorder.cpp +++ b/dom/media/MediaRecorder.cpp @@ -119,17 +119,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN NS_IMPL_CYCLE_COLLECTION_UNLINK(mDOMStream) NS_IMPL_CYCLE_COLLECTION_UNLINK(mAudioNode) NS_IMPL_CYCLE_COLLECTION_UNLINK(mSecurityDomException) NS_IMPL_CYCLE_COLLECTION_UNLINK(mUnknownDomException) tmp->UnRegisterActivityObserver(); 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) NS_IMPL_ADDREF_INHERITED(MediaRecorder, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(MediaRecorder, DOMEventTargetHelper) /** * Session is an object to represent a single recording event.
--- a/dom/media/MediaStreamTrack.cpp +++ b/dom/media/MediaStreamTrack.cpp @@ -202,17 +202,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mSource) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOriginalTrack) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPrincipal) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPendingPrincipal) 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* MediaStreamTrack::GetParentObject() const { MOZ_RELEASE_ASSERT(mOwningStream); return mOwningStream->GetParentObject(); }
--- a/dom/media/MediaTrack.cpp +++ b/dom/media/MediaTrack.cpp @@ -27,17 +27,17 @@ MediaTrack::MediaTrack(const nsAString& MediaTrack::~MediaTrack() { } 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 MediaTrack::SetTrackList(MediaTrackList* aList) { mList = aList; }
--- a/dom/media/MediaTrackList.cpp +++ b/dom/media/MediaTrackList.cpp @@ -30,17 +30,17 @@ MediaTrackList::~MediaTrackList() NS_IMPL_CYCLE_COLLECTION_INHERITED(MediaTrackList, DOMEventTargetHelper, mTracks, mMediaElement) 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* MediaTrackList::operator[](uint32_t aIndex) { return mTracks.ElementAt(aIndex); }
--- a/dom/media/TextTrack.cpp +++ b/dom/media/TextTrack.cpp @@ -22,17 +22,17 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(TextT DOMEventTargetHelper, mCueList, mActiveCueList, mTextTrackList, mTrackElement) 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, TextTrackKind aKind, const nsAString& aLabel, const nsAString& aLanguage, TextTrackMode aMode, TextTrackReadyState aReadyState,
--- a/dom/media/TextTrackCue.cpp +++ b/dom/media/TextTrackCue.cpp @@ -18,17 +18,17 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(TextT mDocument, mTrack, mTrackElement, mDisplayState, mRegion) 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<nsIWebVTTParserWrapper> TextTrackCue::sParserWrapper; // Set cue setting defaults based on step 19 & seq. // in http://dev.w3.org/html5/webvtt/#parsing void TextTrackCue::SetDefaultCueSettings()
--- a/dom/media/TextTrackList.cpp +++ b/dom/media/TextTrackList.cpp @@ -18,17 +18,17 @@ namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(TextTrackList, DOMEventTargetHelper, mTextTracks, mTextTrackManager) 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) : DOMEventTargetHelper(aOwnerWindow) { } TextTrackList::TextTrackList(nsPIDOMWindowInner* aOwnerWindow,
--- a/dom/media/VideoTrack.cpp +++ b/dom/media/VideoTrack.cpp @@ -27,17 +27,17 @@ VideoTrack::VideoTrack(const nsAString& VideoTrack::~VideoTrack() { } 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* VideoTrack::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) { return VideoTrackBinding::Wrap(aCx, this, aGivenProto); }
--- a/dom/media/eme/MediaEncryptedEvent.cpp +++ b/dom/media/eme/MediaEncryptedEvent.cpp @@ -26,17 +26,17 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INH NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mInitData) NS_IMPL_CYCLE_COLLECTION_TRACE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(MediaEncryptedEvent, Event) tmp->mInitData = nullptr; 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) : Event(aOwner, nullptr, nullptr) { mozilla::HoldJSObjects(this); }
--- a/dom/media/eme/MediaKeyMessageEvent.cpp +++ b/dom/media/eme/MediaKeyMessageEvent.cpp @@ -30,17 +30,17 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INH NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mMessage) NS_IMPL_CYCLE_COLLECTION_TRACE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(MediaKeyMessageEvent, Event) tmp->mMessage = nullptr; 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) : Event(aOwner, nullptr, nullptr) { mozilla::HoldJSObjects(this); }
--- a/dom/media/eme/MediaKeySession.cpp +++ b/dom/media/eme/MediaKeySession.cpp @@ -28,17 +28,17 @@ namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(MediaKeySession, DOMEventTargetHelper, mMediaKeyError, mKeys, 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) NS_IMPL_RELEASE_INHERITED(MediaKeySession, DOMEventTargetHelper) // Count of number of instances. Used to give each instance a // unique token. static uint32_t sMediaKeySessionNum = 0;
--- a/dom/media/imagecapture/ImageCapture.cpp +++ b/dom/media/imagecapture/ImageCapture.cpp @@ -24,17 +24,17 @@ LogModule* GetICLog() return log; } 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) NS_IMPL_RELEASE_INHERITED(ImageCapture, DOMEventTargetHelper) ImageCapture::ImageCapture(VideoStreamTrack* aVideoStreamTrack, nsPIDOMWindowInner* aOwnerWindow) : DOMEventTargetHelper(aOwnerWindow)
--- a/dom/media/mediasource/MediaSource.cpp +++ b/dom/media/mediasource/MediaSource.cpp @@ -618,17 +618,17 @@ MediaSource::WrapObject(JSContext* aCx, NS_IMPL_CYCLE_COLLECTION_INHERITED(MediaSource, DOMEventTargetHelper, mMediaElement, mSourceBuffers, mActiveSourceBuffers) 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) #undef MSE_DEBUG #undef MSE_API } // namespace dom
--- a/dom/media/mediasource/SourceBuffer.cpp +++ b/dom/media/mediasource/SourceBuffer.cpp @@ -592,17 +592,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMediaSource) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mBuffered) 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 #undef MSE_DEBUGV #undef MSE_API } // namespace dom
--- a/dom/media/mediasource/SourceBufferList.cpp +++ b/dom/media/mediasource/SourceBufferList.cpp @@ -211,16 +211,16 @@ SourceBufferList::WrapObject(JSContext* } NS_IMPL_CYCLE_COLLECTION_INHERITED(SourceBufferList, DOMEventTargetHelper, mMediaSource, mSourceBuffers) 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 #undef MSE_DEBUG } // namespace dom } // namespace mozilla
--- a/dom/media/webaudio/AudioBufferSourceNode.cpp +++ b/dom/media/webaudio/AudioBufferSourceNode.cpp @@ -21,17 +21,17 @@ namespace mozilla { namespace dom { 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) NS_IMPL_RELEASE_INHERITED(AudioBufferSourceNode, AudioScheduledSourceNode) /** * Media-thread playback engine for AudioBufferSourceNode. * Nothing is played until a non-null buffer has been set (via
--- a/dom/media/webaudio/AudioContext.cpp +++ b/dom/media/webaudio/AudioContext.cpp @@ -109,17 +109,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ // mAllNodes is an array of weak pointers, ignore it here. // mPannerNodes is an array of weak pointers, ignore it here. // mBasicWaveFormCache cannot participate in cycles, ignore it here. 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) static float GetSampleRateForAudioContext(bool aIsOffline, float aSampleRate) { if (aIsOffline) { return aSampleRate; } else {
--- a/dom/media/webaudio/AudioDestinationNode.cpp +++ b/dom/media/webaudio/AudioDestinationNode.cpp @@ -309,17 +309,17 @@ private: bool mLastInputMuted; bool mSuspended; }; 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) NS_IMPL_ADDREF_INHERITED(AudioDestinationNode, AudioNode) NS_IMPL_RELEASE_INHERITED(AudioDestinationNode, AudioNode) AudioDestinationNode::AudioDestinationNode(AudioContext* aContext, bool aIsOffline,
--- a/dom/media/webaudio/AudioNode.cpp +++ b/dom/media/webaudio/AudioNode.cpp @@ -34,17 +34,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mContext) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOutputNodes) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOutputParams) 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) AudioNode::AudioNode(AudioContext* aContext, uint32_t aChannelCount, ChannelCountMode aChannelCountMode, ChannelInterpretation aChannelInterpretation) : DOMEventTargetHelper(aContext->GetParentObject())
--- a/dom/media/webaudio/AudioProcessingEvent.cpp +++ b/dom/media/webaudio/AudioProcessingEvent.cpp @@ -10,17 +10,17 @@ #include "AudioContext.h" namespace mozilla { 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) NS_IMPL_RELEASE_INHERITED(AudioProcessingEvent, Event) AudioProcessingEvent::AudioProcessingEvent(ScriptProcessorNode* aOwner, nsPresContext* aPresContext, WidgetEvent* aEvent)
--- a/dom/media/webaudio/BiquadFilterNode.cpp +++ b/dom/media/webaudio/BiquadFilterNode.cpp @@ -16,17 +16,17 @@ #include "AudioParamTimeline.h" namespace mozilla { 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) NS_IMPL_RELEASE_INHERITED(BiquadFilterNode, AudioNode) static void SetParamsOnBiquad(WebCore::Biquad& aBiquad, float aSampleRate,
--- a/dom/media/webaudio/ConstantSourceNode.cpp +++ b/dom/media/webaudio/ConstantSourceNode.cpp @@ -12,17 +12,17 @@ #include "AudioNodeStream.h" namespace mozilla { 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) NS_IMPL_RELEASE_INHERITED(ConstantSourceNode, AudioScheduledSourceNode) class ConstantSourceNodeEngine final : public AudioNodeEngine { public:
--- a/dom/media/webaudio/ConvolverNode.cpp +++ b/dom/media/webaudio/ConvolverNode.cpp @@ -13,17 +13,17 @@ #include "blink/Reverb.h" #include "PlayingRefChangeHandler.h" namespace mozilla { 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) NS_IMPL_RELEASE_INHERITED(ConvolverNode, AudioNode) class ConvolverNodeEngine final : public AudioNodeEngine { typedef PlayingRefChangeHandler PlayingRefChanged;
--- a/dom/media/webaudio/DelayNode.cpp +++ b/dom/media/webaudio/DelayNode.cpp @@ -14,17 +14,17 @@ #include "PlayingRefChangeHandler.h" namespace mozilla { 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) NS_IMPL_RELEASE_INHERITED(DelayNode, AudioNode) class DelayNodeEngine final : public AudioNodeEngine { typedef PlayingRefChangeHandler PlayingRefChanged;
--- a/dom/media/webaudio/DynamicsCompressorNode.cpp +++ b/dom/media/webaudio/DynamicsCompressorNode.cpp @@ -20,17 +20,17 @@ namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(DynamicsCompressorNode, AudioNode, mThreshold, mKnee, mRatio, 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) NS_IMPL_RELEASE_INHERITED(DynamicsCompressorNode, AudioNode) class DynamicsCompressorNodeEngine final : public AudioNodeEngine { public:
--- a/dom/media/webaudio/GainNode.cpp +++ b/dom/media/webaudio/GainNode.cpp @@ -13,17 +13,17 @@ #include "WebAudioUtils.h" namespace mozilla { 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) NS_IMPL_RELEASE_INHERITED(GainNode, AudioNode) class GainNodeEngine final : public AudioNodeEngine { public:
--- a/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp +++ b/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp @@ -54,25 +54,25 @@ private: RefPtr<MediaStreamAudioDestinationNode> mNode; }; 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, mNode) 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) NS_IMPL_RELEASE_INHERITED(MediaStreamAudioDestinationNode, AudioNode) MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode(AudioContext* aContext) : AudioNode(aContext, 2,
--- a/dom/media/webaudio/MediaStreamAudioSourceNode.cpp +++ b/dom/media/webaudio/MediaStreamAudioSourceNode.cpp @@ -25,17 +25,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(Me NS_IMPL_CYCLE_COLLECTION_UNLINK(mInputTrack) NS_IMPL_CYCLE_COLLECTION_UNLINK_END_INHERITED(AudioNode) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(MediaStreamAudioSourceNode, AudioNode) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mInputStream) 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) NS_IMPL_RELEASE_INHERITED(MediaStreamAudioSourceNode, AudioNode) MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AudioContext* aContext) : AudioNode(aContext, 2,
--- a/dom/media/webaudio/OscillatorNode.cpp +++ b/dom/media/webaudio/OscillatorNode.cpp @@ -13,17 +13,17 @@ #include "blink/PeriodicWave.h" namespace mozilla { 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) NS_IMPL_RELEASE_INHERITED(OscillatorNode, AudioScheduledSourceNode) class OscillatorNodeEngine final : public AudioNodeEngine { public:
--- a/dom/media/webaudio/PannerNode.cpp +++ b/dom/media/webaudio/PannerNode.cpp @@ -31,17 +31,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN tmp->Context()->UnregisterPannerNode(tmp); } NS_IMPL_CYCLE_COLLECTION_UNLINK(mPositionX, mPositionY, mPositionZ, mOrientationX, mOrientationY, mOrientationZ) NS_IMPL_CYCLE_COLLECTION_UNLINK_END 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) NS_IMPL_RELEASE_INHERITED(PannerNode, AudioNode) class PannerNodeEngine final : public AudioNodeEngine { public:
--- a/dom/media/webaudio/StereoPannerNode.cpp +++ b/dom/media/webaudio/StereoPannerNode.cpp @@ -17,17 +17,17 @@ namespace mozilla { namespace dom { 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) NS_IMPL_RELEASE_INHERITED(StereoPannerNode, AudioNode) class StereoPannerNodeEngine final : public AudioNodeEngine { public:
--- a/dom/media/webaudio/WaveShaperNode.cpp +++ b/dom/media/webaudio/WaveShaperNode.cpp @@ -23,17 +23,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(WaveShaperNode, AudioNode) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END 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) NS_IMPL_RELEASE_INHERITED(WaveShaperNode, AudioNode) static uint32_t ValueOf(OverSampleType aType) { switch (aType) {
--- a/dom/media/webspeech/recognition/SpeechRecognition.cpp +++ b/dom/media/webspeech/recognition/SpeechRecognition.cpp @@ -98,17 +98,17 @@ GetSpeechRecognitionService(const nsAStr nsresult rv; nsCOMPtr<nsISpeechRecognitionService> recognitionService; recognitionService = do_GetService(speechRecognitionServiceCID.get(), &rv); return recognitionService.forget(); } 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) NS_IMPL_ADDREF_INHERITED(SpeechRecognition, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(SpeechRecognition, DOMEventTargetHelper) SpeechRecognition::SpeechRecognition(nsPIDOMWindowInner* aOwnerWindow) : DOMEventTargetHelper(aOwnerWindow)
--- a/dom/media/webspeech/synth/SpeechSynthesis.cpp +++ b/dom/media/webspeech/synth/SpeechSynthesis.cpp @@ -43,17 +43,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCurrentTask) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mSpeechQueue) for (auto iter = tmp->mVoiceCache.Iter(); !iter.Done(); iter.Next()) { SpeechSynthesisVoice* voice = iter.UserData(); cb.NoteXPCOMChild(voice); } 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) NS_IMPL_ADDREF_INHERITED(SpeechSynthesis, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(SpeechSynthesis, DOMEventTargetHelper) SpeechSynthesis::SpeechSynthesis(nsPIDOMWindowInner* aParent)
--- a/dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp +++ b/dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp @@ -16,17 +16,17 @@ #include <stdlib.h> namespace mozilla { 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) NS_IMPL_RELEASE_INHERITED(SpeechSynthesisUtterance, DOMEventTargetHelper) SpeechSynthesisUtterance::SpeechSynthesisUtterance(nsPIDOMWindowInner* aOwnerWindow, const nsAString& text) : DOMEventTargetHelper(aOwnerWindow)
--- a/dom/messagechannel/MessagePort.cpp +++ b/dom/messagechannel/MessagePort.cpp @@ -188,17 +188,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ DOMEventTargetHelper) if (tmp->mPostMessageRunnable) { NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPostMessageRunnable->mPort); } 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) NS_IMPL_ADDREF_INHERITED(MessagePort, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(MessagePort, DOMEventTargetHelper) namespace {
--- a/dom/network/TCPServerSocket.cpp +++ b/dom/network/TCPServerSocket.cpp @@ -33,17 +33,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN NS_IMPL_CYCLE_COLLECTION_UNLINK(mServerSocket) NS_IMPL_CYCLE_COLLECTION_UNLINK(mServerBridgeChild) NS_IMPL_CYCLE_COLLECTION_UNLINK(mServerBridgeParent) 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) TCPServerSocket::TCPServerSocket(nsIGlobalObject* aGlobal, uint16_t aPort, bool aUseArrayBuffers, uint16_t aBacklog) : DOMEventTargetHelper(aGlobal) , mPort(aPort) , mBacklog(aBacklog)
--- a/dom/network/TCPSocket.cpp +++ b/dom/network/TCPSocket.cpp @@ -127,17 +127,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN NS_IMPL_CYCLE_COLLECTION_UNLINK(mPendingDataAfterStartTLS) NS_IMPL_CYCLE_COLLECTION_UNLINK(mSocketBridgeChild) NS_IMPL_CYCLE_COLLECTION_UNLINK(mSocketBridgeParent) 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) NS_INTERFACE_MAP_ENTRY(nsIInputStreamCallback) NS_INTERFACE_MAP_ENTRY(nsIObserver) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsITCPSocketCallback) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper)
--- a/dom/network/UDPSocket.cpp +++ b/dom/network/UDPSocket.cpp @@ -35,17 +35,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN NS_IMPL_CYCLE_COLLECTION_UNLINK(mOpened) NS_IMPL_CYCLE_COLLECTION_UNLINK(mClosed) tmp->CloseWithReason(NS_OK); 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) /* static */ already_AddRefed<UDPSocket> UDPSocket::Constructor(const GlobalObject& aGlobal, const UDPOptions& aOptions, ErrorResult& aRv)
--- a/dom/notification/Notification.cpp +++ b/dom/notification/Notification.cpp @@ -1184,17 +1184,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(Notification, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mData) 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) nsIPrincipal* Notification::GetPrincipal() { AssertIsOnMainThread();
--- a/dom/notification/NotificationEvent.cpp +++ b/dom/notification/NotificationEvent.cpp @@ -13,14 +13,14 @@ BEGIN_WORKERS_NAMESPACE NotificationEvent::NotificationEvent(EventTarget* aOwner) : ExtendableEvent(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) END_WORKERS_NAMESPACE
--- a/dom/offline/nsDOMOfflineResourceList.cpp +++ b/dom/offline/nsDOMOfflineResourceList.cpp @@ -56,17 +56,17 @@ static const char kMaxEntriesPref[] = " // nsDOMOfflineResourceList // NS_IMPL_CYCLE_COLLECTION_INHERITED(nsDOMOfflineResourceList, DOMEventTargetHelper, 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) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(nsDOMOfflineResourceList, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(nsDOMOfflineResourceList, DOMEventTargetHelper)
--- a/dom/payments/PaymentRequest.cpp +++ b/dom/payments/PaymentRequest.cpp @@ -35,17 +35,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_UNLINK(mResultPromise) NS_IMPL_CYCLE_COLLECTION_UNLINK(mAcceptPromise) NS_IMPL_CYCLE_COLLECTION_UNLINK(mAbortPromise) NS_IMPL_CYCLE_COLLECTION_UNLINK(mResponse) NS_IMPL_CYCLE_COLLECTION_UNLINK(mShippingAddress) NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(PaymentRequest) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PaymentRequest) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(PaymentRequest, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(PaymentRequest, DOMEventTargetHelper) bool PaymentRequest::PrefEnabled(JSContext* aCx, JSObject* aObj) {
--- a/dom/payments/PaymentRequestUpdateEvent.cpp +++ b/dom/payments/PaymentRequestUpdateEvent.cpp @@ -9,17 +9,17 @@ namespace mozilla { namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(PaymentRequestUpdateEvent, Event, mRequest) NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(PaymentRequestUpdateEvent, Event) NS_IMPL_CYCLE_COLLECTION_TRACE_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(PaymentRequestUpdateEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PaymentRequestUpdateEvent) NS_INTERFACE_MAP_END_INHERITING(Event) NS_IMPL_ADDREF_INHERITED(PaymentRequestUpdateEvent, Event) NS_IMPL_RELEASE_INHERITED(PaymentRequestUpdateEvent, Event) already_AddRefed<PaymentRequestUpdateEvent> PaymentRequestUpdateEvent::Constructor(mozilla::dom::EventTarget* aOwner, const nsAString& aType,
--- a/dom/performance/Performance.cpp +++ b/dom/performance/Performance.cpp @@ -82,17 +82,17 @@ public: private: bool mEnabled; nsCString mPrefName; }; } // anonymous namespace -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, DOMEventTargetHelper, mUserEntries, mResourceEntries); NS_IMPL_ADDREF_INHERITED(Performance, DOMEventTargetHelper)
--- a/dom/performance/PerformanceResourceTiming.cpp +++ b/dom/performance/PerformanceResourceTiming.cpp @@ -12,17 +12,17 @@ using namespace mozilla::dom; NS_IMPL_CYCLE_COLLECTION_INHERITED(PerformanceResourceTiming, PerformanceEntry, mTiming) 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) NS_IMPL_RELEASE_INHERITED(PerformanceResourceTiming, PerformanceEntry) PerformanceResourceTiming::PerformanceResourceTiming(PerformanceTiming* aPerformanceTiming, Performance* aPerformance, const nsAString& aName)
--- a/dom/presentation/PresentationAvailability.cpp +++ b/dom/presentation/PresentationAvailability.cpp @@ -27,17 +27,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(PresentationAvailability, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_UNLINK(mPromises); tmp->Shutdown(); 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) /* static */ already_AddRefed<PresentationAvailability> PresentationAvailability::Create(nsPIDOMWindowInner* aWindow, const nsTArray<nsString>& aUrls, RefPtr<Promise>& aPromise) {
--- a/dom/presentation/PresentationConnection.cpp +++ b/dom/presentation/PresentationConnection.cpp @@ -36,17 +36,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(PresentationConnection, DOMEventTargetHelper) tmp->Shutdown(); NS_IMPL_CYCLE_COLLECTION_UNLINK(mOwningConnectionList) 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) PresentationConnection::PresentationConnection(nsPIDOMWindowInner* aWindow, const nsAString& aId, const nsAString& aUrl, const uint8_t aRole,
--- a/dom/presentation/PresentationConnectionList.cpp +++ b/dom/presentation/PresentationConnectionList.cpp @@ -17,17 +17,17 @@ namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(PresentationConnectionList, DOMEventTargetHelper, mGetConnectionListPromise, mConnections) 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, Promise* aPromise) : DOMEventTargetHelper(aWindow) , mGetConnectionListPromise(aPromise) { MOZ_ASSERT(aWindow);
--- a/dom/presentation/PresentationRequest.cpp +++ b/dom/presentation/PresentationRequest.cpp @@ -32,17 +32,17 @@ #include "PresentationTransportBuilderConstructor.h" using namespace mozilla; 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 GetAbsoluteURL(const nsAString& aUrl, nsIURI* aBaseUri, nsIDocument* aDocument, nsAString& aAbsoluteUrl) {
--- a/dom/quota/QuotaRequests.cpp +++ b/dom/quota/QuotaRequests.cpp @@ -135,17 +135,17 @@ UsageRequest::SetResult(nsIVariant* aRes mHaveResultOrErrorCode = true; FireCallback(); } 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) NS_IMPL_ADDREF_INHERITED(UsageRequest, RequestBase) NS_IMPL_RELEASE_INHERITED(UsageRequest, RequestBase) NS_IMETHODIMP UsageRequest::GetResult(nsIVariant** aResult) @@ -253,17 +253,17 @@ Request::GetResult(nsIVariant** aResult) } NS_IF_ADDREF(*aResult = mResult); return NS_OK; } NS_IMPL_CYCLE_COLLECTION_INHERITED(Request, RequestBase, mCallback, mResult) -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) NS_IMPL_ADDREF_INHERITED(mozilla::dom::quota::Request, RequestBase) NS_IMPL_RELEASE_INHERITED(mozilla::dom::quota::Request, RequestBase) NS_IMETHODIMP Request::GetCallback(nsIQuotaCallback** aCallback)
--- a/dom/script/ModuleLoadRequest.cpp +++ b/dom/script/ModuleLoadRequest.cpp @@ -10,17 +10,17 @@ namespace mozilla { namespace dom { #undef LOG #define LOG(args) \ MOZ_LOG(ScriptLoader::gScriptLoaderLog, mozilla::LogLevel::Debug, args) -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_INHERITED(ModuleLoadRequest, ScriptLoadRequest, mBaseURL, mLoader, mParent, mModuleScript, mImports)
--- a/dom/smil/TimeEvent.cpp +++ b/dom/smil/TimeEvent.cpp @@ -36,17 +36,17 @@ TimeEvent::TimeEvent(EventTarget* aOwner } NS_IMPL_CYCLE_COLLECTION_INHERITED(TimeEvent, Event, mView) 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) NS_IMETHODIMP TimeEvent::GetDetail(int32_t* aDetail) { *aDetail = mDetail; return NS_OK;
--- a/dom/svg/SVGSwitchElement.cpp +++ b/dom/svg/SVGSwitchElement.cpp @@ -28,17 +28,17 @@ SVGSwitchElement::WrapNode(JSContext *aC // nsISupports methods NS_IMPL_CYCLE_COLLECTION_INHERITED(SVGSwitchElement, SVGSwitchElementBase, mActiveChild) 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) //---------------------------------------------------------------------- // Implementation SVGSwitchElement::SVGSwitchElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo) : SVGSwitchElementBase(aNodeInfo) {
--- a/dom/vr/VRDisplay.cpp +++ b/dom/vr/VRDisplay.cpp @@ -723,17 +723,17 @@ VRDisplay::SetGroupMask(const uint32_t& mClient->SetGroupMask(aGroupMask); } NS_IMPL_CYCLE_COLLECTION_INHERITED(VRDisplay, DOMEventTargetHelper, mCapabilities, mStageParameters) 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) NS_IMPL_CYCLE_COLLECTION_CLASS(VRFrameData) NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(VRFrameData) NS_IMPL_CYCLE_COLLECTION_UNLINK(mParent, mPose)
--- a/dom/vr/VRDisplayEvent.cpp +++ b/dom/vr/VRDisplayEvent.cpp @@ -23,17 +23,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(VRDisplayEvent, Event) NS_IMPL_CYCLE_COLLECTION_TRACE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(VRDisplayEvent, Event) NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(VRDisplayEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(VRDisplayEvent) NS_INTERFACE_MAP_END_INHERITING(Event) VRDisplayEvent::VRDisplayEvent(mozilla::dom::EventTarget* aOwner) : Event(aOwner, nullptr, nullptr) { } VRDisplayEvent::~VRDisplayEvent()
--- a/dom/vr/VRServiceTest.cpp +++ b/dom/vr/VRServiceTest.cpp @@ -15,17 +15,17 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(VRMockDis NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(VRMockDisplay, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(VRMockDisplay, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(VRMockDisplay) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(VRMockDisplay) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(VRMockDisplay, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(VRMockDisplay, DOMEventTargetHelper) VRMockDisplay::VRMockDisplay(const nsCString& aID, uint32_t aDeviceID) : mDeviceID(aDeviceID) , mTimestamp(TimeStamp::Now()) @@ -153,17 +153,17 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(VRMockCon NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(VRMockController, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(VRMockController, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(VRMockController) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(VRMockController) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(VRMockController, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(VRMockController, DOMEventTargetHelper) VRMockController::VRMockController(const nsCString& aID, uint32_t aDeviceID) : mID(aID), mDeviceID(aDeviceID) { @@ -263,17 +263,17 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(VRService NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(VRServiceTest, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(VRServiceTest, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(VRServiceTest) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(VRServiceTest) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(VRServiceTest, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(VRServiceTest, DOMEventTargetHelper) JSObject* VRServiceTest::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
--- a/dom/webauthn/AuthenticatorAssertionResponse.cpp +++ b/dom/webauthn/AuthenticatorAssertionResponse.cpp @@ -8,17 +8,17 @@ #include "mozilla/dom/AuthenticatorAssertionResponse.h" namespace mozilla { namespace dom { NS_IMPL_ADDREF_INHERITED(AuthenticatorAssertionResponse, AuthenticatorResponse) NS_IMPL_RELEASE_INHERITED(AuthenticatorAssertionResponse, AuthenticatorResponse) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(AuthenticatorAssertionResponse) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AuthenticatorAssertionResponse) NS_INTERFACE_MAP_END_INHERITING(AuthenticatorResponse) AuthenticatorAssertionResponse::AuthenticatorAssertionResponse(nsPIDOMWindowInner* aParent) : AuthenticatorResponse(aParent) {} AuthenticatorAssertionResponse::~AuthenticatorAssertionResponse() {}
--- a/dom/webauthn/AuthenticatorAttestationResponse.cpp +++ b/dom/webauthn/AuthenticatorAttestationResponse.cpp @@ -8,17 +8,17 @@ #include "mozilla/dom/AuthenticatorAttestationResponse.h" namespace mozilla { namespace dom { NS_IMPL_ADDREF_INHERITED(AuthenticatorAttestationResponse, AuthenticatorResponse) NS_IMPL_RELEASE_INHERITED(AuthenticatorAttestationResponse, AuthenticatorResponse) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(AuthenticatorAttestationResponse) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AuthenticatorAttestationResponse) NS_INTERFACE_MAP_END_INHERITING(AuthenticatorResponse) AuthenticatorAttestationResponse::AuthenticatorAttestationResponse(nsPIDOMWindowInner* aParent) : AuthenticatorResponse(aParent) {} AuthenticatorAttestationResponse::~AuthenticatorAttestationResponse() {}
--- a/dom/webauthn/PublicKeyCredential.cpp +++ b/dom/webauthn/PublicKeyCredential.cpp @@ -11,17 +11,17 @@ namespace mozilla { namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(PublicKeyCredential, Credential, mResponse) NS_IMPL_ADDREF_INHERITED(PublicKeyCredential, Credential) NS_IMPL_RELEASE_INHERITED(PublicKeyCredential, Credential) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(PublicKeyCredential) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PublicKeyCredential) NS_INTERFACE_MAP_END_INHERITING(Credential) NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(PublicKeyCredential, Credential) NS_IMPL_CYCLE_COLLECTION_TRACE_END PublicKeyCredential::PublicKeyCredential(nsPIDOMWindowInner* aParent) : Credential(aParent) {}
--- a/dom/workers/ServiceWorker.cpp +++ b/dom/workers/ServiceWorker.cpp @@ -54,17 +54,17 @@ ServiceWorker::~ServiceWorker() { AssertIsOnMainThread(); mInfo->RemoveWorker(this); } 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* ServiceWorker::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) { AssertIsOnMainThread(); return ServiceWorkerBinding::Wrap(aCx, this, aGivenProto);
--- a/dom/workers/ServiceWorkerContainer.cpp +++ b/dom/workers/ServiceWorkerContainer.cpp @@ -23,17 +23,17 @@ #include "mozilla/dom/ServiceWorkerContainerBinding.h" #include "mozilla/dom/workers/bindings/ServiceWorker.h" #include "ServiceWorker.h" 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) NS_IMPL_RELEASE_INHERITED(ServiceWorkerContainer, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_INHERITED(ServiceWorkerContainer, DOMEventTargetHelper, mControllerWorker, mReadyPromise)
--- a/dom/workers/ServiceWorkerEvents.cpp +++ b/dom/workers/ServiceWorkerEvents.cpp @@ -896,17 +896,17 @@ public: NS_IMPL_ISUPPORTS0(WaitUntilHandler) } // anonymous namespace 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) ExtendableEvent::ExtendableEvent(EventTarget* aOwner) : Event(aOwner, nullptr, nullptr) { } @@ -945,17 +945,17 @@ ExtendableEvent::WaitUntil(JSContext* aC RefPtr<WaitUntilHandler> handler = new WaitUntilHandler(GetCurrentThreadWorkerPrivate(), aCx); aPromise.AppendNativeHandler(handler); } 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 { nsresult ExtractBytesFromUSVString(const nsAString& aStr, nsTArray<uint8_t>& aBytes) { MOZ_ASSERT(aBytes.IsEmpty()); auto encoder = UTF_8_ENCODING->NewEncoder(); @@ -1125,17 +1125,17 @@ PushEvent::Constructor(mozilla::dom::Eve e->mData = new PushMessageData(aOwner, Move(bytes)); } return e.forget(); } 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) JSObject* PushEvent::WrapObjectInternal(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) { return mozilla::dom::PushEventBinding::Wrap(aCx, this, aGivenProto); @@ -1242,15 +1242,15 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMessagePort) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPorts) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END 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) NS_IMPL_RELEASE_INHERITED(ExtendableMessageEvent, Event) END_WORKERS_NAMESPACE
--- a/dom/workers/ServiceWorkerRegistration.cpp +++ b/dom/workers/ServiceWorkerRegistration.cpp @@ -189,17 +189,17 @@ private: RefPtr<ServiceWorker> mActiveWorker; RefPtr<PushManager> mPushManager; }; 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, ServiceWorkerRegistration, mPushManager, mInstallingWorker, mWaitingWorker, mActiveWorker); ServiceWorkerRegistrationMainThread::ServiceWorkerRegistrationMainThread(nsPIDOMWindowInner* aWindow, @@ -1084,17 +1084,17 @@ private: { MOZ_ASSERT(!mListeningForEvents); } }; 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. NS_IMPL_CYCLE_COLLECTION_CLASS(ServiceWorkerRegistrationWorkerThread) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(ServiceWorkerRegistrationWorkerThread, ServiceWorkerRegistration) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPushManager) @@ -1342,17 +1342,17 @@ ServiceWorkerRegistrationWorkerThread::G } //////////////////////////////////////////////////// // Base class implementation 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, const nsAString& aScope) : DOMEventTargetHelper(aWindow) , mScope(aScope) {}
--- a/dom/workers/SharedWorker.cpp +++ b/dom/workers/SharedWorker.cpp @@ -157,17 +157,17 @@ SharedWorker::PostMessage(JSContext* aCx MOZ_ASSERT(mMessagePort); mMessagePort->PostMessage(aCx, aMessage, aTransferable, aRv); } 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) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(SharedWorker, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMessagePort) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFrozenEvents)
--- a/dom/workers/WorkerPrivate.cpp +++ b/dom/workers/WorkerPrivate.cpp @@ -4043,17 +4043,17 @@ WorkerPrivateParent<Derived>::FlushRepor template <class Derived> NS_IMPL_ADDREF_INHERITED(WorkerPrivateParent<Derived>, DOMEventTargetHelper) template <class Derived> NS_IMPL_RELEASE_INHERITED(WorkerPrivateParent<Derived>, DOMEventTargetHelper) template <class Derived> -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(WorkerPrivateParent<Derived>) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(WorkerPrivateParent<Derived>) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) template <class Derived> NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(WorkerPrivateParent<Derived>, DOMEventTargetHelper) tmp->AssertIsOnParentThread(); // The WorkerPrivate::mSelfRef has a reference to itself, which is really
--- a/dom/workers/WorkerScope.cpp +++ b/dom/workers/WorkerScope.cpp @@ -597,17 +597,17 @@ void SharedWorkerGlobalScope::Close(JSContext* aCx) { mWorkerPrivate->AssertIsOnWorkerThread(); mWorkerPrivate->CloseInternal(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) NS_IMPL_RELEASE_INHERITED(ServiceWorkerGlobalScope, WorkerGlobalScope) ServiceWorkerGlobalScope::ServiceWorkerGlobalScope(WorkerPrivate* aWorkerPrivate, const nsACString& aScope) : WorkerGlobalScope(aWorkerPrivate),
--- a/dom/xhr/XMLHttpRequestEventTarget.cpp +++ b/dom/xhr/XMLHttpRequestEventTarget.cpp @@ -14,17 +14,17 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(XMLHttpRe NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(XMLHttpRequestEventTarget, DOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END 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) NS_IMPL_ADDREF_INHERITED(XMLHttpRequestEventTarget, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(XMLHttpRequestEventTarget, DOMEventTargetHelper) void XMLHttpRequestEventTarget::DisconnectFromOwner()
--- a/dom/xhr/XMLHttpRequestMainThread.cpp +++ b/dom/xhr/XMLHttpRequestMainThread.cpp @@ -375,17 +375,17 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_END bool XMLHttpRequestMainThread::IsCertainlyAliveForCC() const { return mWaitingForOnStopRequest; } // 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(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) NS_INTERFACE_MAP_ENTRY(nsIChannelEventSink) NS_INTERFACE_MAP_ENTRY(nsIProgressEventSink) NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsITimerCallback)
--- a/dom/xhr/XMLHttpRequestWorker.cpp +++ b/dom/xhr/XMLHttpRequestWorker.cpp @@ -1552,17 +1552,17 @@ XMLHttpRequestWorker::~XMLHttpRequestWor MOZ_ASSERT(!mRooted); mozilla::DropJSObjects(this); } 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) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(XMLHttpRequestWorker, XMLHttpRequestEventTarget) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mUpload) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
--- a/dom/xml/nsXMLContentSink.cpp +++ b/dom/xml/nsXMLContentSink.cpp @@ -127,17 +127,17 @@ nsXMLContentSink::Init(nsIDocument* aDoc } mState = eXMLContentSinkState_InProlog; mDocElement = nullptr; 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) NS_INTERFACE_MAP_ENTRY(nsITransformObserver) NS_INTERFACE_MAP_END_INHERITING(nsContentSink) NS_IMPL_ADDREF_INHERITED(nsXMLContentSink, nsContentSink) NS_IMPL_RELEASE_INHERITED(nsXMLContentSink, nsContentSink)
--- a/dom/xml/nsXMLFragmentContentSink.cpp +++ b/dom/xml/nsXMLFragmentContentSink.cpp @@ -129,17 +129,17 @@ nsXMLFragmentContentSink::nsXMLFragmentC { mRunsToCompletion = true; } 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) NS_IMPL_ADDREF_INHERITED(nsXMLFragmentContentSink, nsXMLContentSink) NS_IMPL_RELEASE_INHERITED(nsXMLFragmentContentSink, nsXMLContentSink) NS_IMPL_CYCLE_COLLECTION_CLASS(nsXMLFragmentContentSink)
--- a/dom/xul/templates/nsXULTreeBuilder.cpp +++ b/dom/xul/templates/nsXULTreeBuilder.cpp @@ -42,17 +42,17 @@ NS_IMPL_RELEASE_INHERITED(nsXULTreeBuild NS_IMPL_CYCLE_COLLECTION_INHERITED(nsXULTreeBuilder, nsXULTemplateBuilder, mBoxObject, mSelection, mPersistStateStore, 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_INTERFACE_MAP_END_INHERITING(nsXULTemplateBuilder) nsXULTreeBuilder::nsXULTreeBuilder(Element* aElement) : nsXULTemplateBuilder(aElement), mSortDirection(eDirection_Natural), mSortHints(0)
--- a/editor/libeditor/HTMLEditor.cpp +++ b/editor/libeditor/HTMLEditor.cpp @@ -229,17 +229,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAddRowBeforeButton) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mRemoveRowButton) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAddRowAfterButton) 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) NS_INTERFACE_MAP_ENTRY(nsIHTMLInlineTableEditor) NS_INTERFACE_MAP_ENTRY(nsITableEditor) NS_INTERFACE_MAP_ENTRY(nsIEditorStyleSheets) NS_INTERFACE_MAP_ENTRY(nsICSSLoaderObserver) NS_INTERFACE_MAP_ENTRY(nsIMutationObserver)
--- a/editor/libeditor/TextEditor.cpp +++ b/editor/libeditor/TextEditor.cpp @@ -101,17 +101,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(TextEditor, EditorBase) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mRules) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCachedDocumentEncoder) 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) NS_IMETHODIMP TextEditor::Init(nsIDOMDocument* aDoc, nsIContent* aRoot,
--- a/layout/style/CSSImportRule.cpp +++ b/layout/style/CSSImportRule.cpp @@ -11,17 +11,17 @@ namespace mozilla { namespace dom { NS_IMPL_ADDREF_INHERITED(CSSImportRule, css::Rule) NS_IMPL_RELEASE_INHERITED(CSSImportRule, css::Rule) // QueryInterface implementation for CSSImportRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(CSSImportRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CSSImportRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSImportRule) NS_INTERFACE_MAP_END_INHERITING(css::Rule) bool CSSImportRule::IsCCLeaf() const { // We're not a leaf. return false;
--- a/layout/style/CSSKeyframeRule.cpp +++ b/layout/style/CSSKeyframeRule.cpp @@ -11,17 +11,17 @@ namespace mozilla { namespace dom { NS_IMPL_ADDREF_INHERITED(CSSKeyframeRule, mozilla::css::Rule) NS_IMPL_RELEASE_INHERITED(CSSKeyframeRule, mozilla::css::Rule) // QueryInterface implementation for CSSKeyframeRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(CSSKeyframeRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CSSKeyframeRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSKeyframeRule) NS_INTERFACE_MAP_END_INHERITING(mozilla::css::Rule) NS_IMETHODIMP CSSKeyframeRule::GetStyle(nsIDOMCSSStyleDeclaration** aStyle) { NS_ADDREF(*aStyle = Style()); return NS_OK;
--- a/layout/style/CSSMediaRule.cpp +++ b/layout/style/CSSMediaRule.cpp @@ -11,17 +11,17 @@ namespace mozilla { namespace dom { NS_IMPL_ADDREF_INHERITED(CSSMediaRule, css::ConditionRule) NS_IMPL_RELEASE_INHERITED(CSSMediaRule, css::ConditionRule) // QueryInterface implementation for CSSMediaRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(CSSMediaRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CSSMediaRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSGroupingRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSConditionRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSMediaRule) NS_INTERFACE_MAP_END_INHERITING(css::ConditionRule) // nsIDOMCSSGroupingRule methods NS_IMETHODIMP CSSMediaRule::GetCssRules(nsIDOMCSSRuleList** aRuleList)
--- a/layout/style/CSSPageRule.cpp +++ b/layout/style/CSSPageRule.cpp @@ -10,17 +10,17 @@ namespace mozilla { namespace dom { NS_IMPL_ADDREF_INHERITED(CSSPageRule, css::Rule) NS_IMPL_RELEASE_INHERITED(CSSPageRule, css::Rule) // QueryInterface implementation for CSSPageRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(CSSPageRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CSSPageRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSPageRule) NS_INTERFACE_MAP_END_INHERITING(css::Rule) NS_IMETHODIMP CSSPageRule::GetStyle(nsIDOMCSSStyleDeclaration** aStyle) { NS_ADDREF(*aStyle = Style()); return NS_OK;
--- a/layout/style/CSSStyleSheet.cpp +++ b/layout/style/CSSStyleSheet.cpp @@ -438,17 +438,17 @@ CSSStyleSheet::TraverseInner(nsCycleColl cb.NoteXPCOMChild(rules[i]); } } StyleSheet::TraverseInner(cb); } // QueryInterface implementation for CSSStyleSheet -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(CSSStyleSheet) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CSSStyleSheet) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMCSSStyleSheet) if (aIID.Equals(NS_GET_IID(CSSStyleSheet))) foundInterface = reinterpret_cast<nsISupports*>(this); else NS_INTERFACE_MAP_END_INHERITING(StyleSheet) NS_IMPL_ADDREF_INHERITED(CSSStyleSheet, StyleSheet) NS_IMPL_RELEASE_INHERITED(CSSStyleSheet, StyleSheet)
--- a/layout/style/FontFaceSet.cpp +++ b/layout/style/FontFaceSet.cpp @@ -88,17 +88,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN NS_IMPL_CYCLE_COLLECTION_UNLINK(mUserFontSet->mFontFaceSet); } NS_IMPL_CYCLE_COLLECTION_UNLINK(mUserFontSet); 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) FontFaceSet::FontFaceSet(nsPIDOMWindowInner* aWindow, nsIDocument* aDocument) : DOMEventTargetHelper(aWindow) , mDocument(aDocument) , mResolveLazilyCreatedReadyPromise(false)
--- a/layout/style/GroupRule.cpp +++ b/layout/style/GroupRule.cpp @@ -241,17 +241,17 @@ GroupRule::GroupRule(const GroupRule& aC GroupRule::~GroupRule() { MOZ_ASSERT(!mSheet, "SetStyleSheet should have been called"); } 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 GroupRule::IsCCLeaf() const { // Let's not worry for now about sorting out whether we're a leaf or not. return false; }
--- a/layout/style/MediaQueryList.cpp +++ b/layout/style/MediaQueryList.cpp @@ -46,17 +46,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN if (tmp->mDocument) { tmp->remove(); NS_IMPL_CYCLE_COLLECTION_UNLINK(mDocument) } tmp->Disconnect(); 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) NS_IMPL_RELEASE_INHERITED(MediaQueryList, DOMEventTargetHelper) void MediaQueryList::GetMedia(nsAString &aMedia) {
--- a/layout/style/ServoCSSRuleList.cpp +++ b/layout/style/ServoCSSRuleList.cpp @@ -29,17 +29,17 @@ ServoCSSRuleList::ServoCSSRuleList(alrea ServoStyleSheet* aDirectOwnerStyleSheet) : mStyleSheet(aDirectOwnerStyleSheet) , mRawRules(aRawRules) { Servo_CssRules_ListTypes(mRawRules, &mRules); } // QueryInterface implementation for ServoCSSRuleList -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServoCSSRuleList) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServoCSSRuleList) NS_INTERFACE_MAP_END_INHERITING(dom::CSSRuleList) NS_IMPL_ADDREF_INHERITED(ServoCSSRuleList, dom::CSSRuleList) NS_IMPL_RELEASE_INHERITED(ServoCSSRuleList, dom::CSSRuleList) NS_IMPL_CYCLE_COLLECTION_CLASS(ServoCSSRuleList) NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(ServoCSSRuleList)
--- a/layout/style/ServoDocumentRule.cpp +++ b/layout/style/ServoDocumentRule.cpp @@ -24,17 +24,17 @@ ServoDocumentRule::ServoDocumentRule(Ref ServoDocumentRule::~ServoDocumentRule() { } NS_IMPL_ADDREF_INHERITED(ServoDocumentRule, CSSMozDocumentRule) NS_IMPL_RELEASE_INHERITED(ServoDocumentRule, CSSMozDocumentRule) // QueryInterface implementation for MozDocumentRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServoDocumentRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServoDocumentRule) NS_INTERFACE_MAP_END_INHERITING(CSSMozDocumentRule) /* virtual */ already_AddRefed<css::Rule> ServoDocumentRule::Clone() const { // Rule::Clone is only used when CSSStyleSheetInner is cloned in // preparation of being mutated. However, ServoStyleSheet never clones // anything, so this method should never be called.
--- a/layout/style/ServoImportRule.cpp +++ b/layout/style/ServoImportRule.cpp @@ -27,17 +27,17 @@ ServoImportRule::ServoImportRule(RefPtr< ServoImportRule::~ServoImportRule() { if (mChildSheet) { mChildSheet->SetOwnerRule(nullptr); } } // QueryInterface implementation for ServoImportRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServoImportRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServoImportRule) NS_INTERFACE_MAP_END_INHERITING(dom::CSSImportRule) NS_IMPL_CYCLE_COLLECTION_CLASS(ServoImportRule) NS_IMPL_ADDREF_INHERITED(ServoImportRule, dom::CSSImportRule) NS_IMPL_RELEASE_INHERITED(ServoImportRule, dom::CSSImportRule) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(ServoImportRule,
--- a/layout/style/ServoKeyframeRule.cpp +++ b/layout/style/ServoKeyframeRule.cpp @@ -103,17 +103,17 @@ NS_INTERFACE_MAP_END_INHERITING(nsDOMCSS ServoKeyframeRule::~ServoKeyframeRule() { } NS_IMPL_ADDREF_INHERITED(ServoKeyframeRule, dom::CSSKeyframeRule) NS_IMPL_RELEASE_INHERITED(ServoKeyframeRule, dom::CSSKeyframeRule) // QueryInterface implementation for nsCSSKeyframeRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServoKeyframeRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServoKeyframeRule) NS_INTERFACE_MAP_END_INHERITING(dom::CSSKeyframeRule) NS_IMPL_CYCLE_COLLECTION_CLASS(ServoKeyframeRule) NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(ServoKeyframeRule, dom::CSSKeyframeRule) if (tmp->mDeclaration) { tmp->mDeclaration->DropReference();
--- a/layout/style/ServoKeyframesRule.cpp +++ b/layout/style/ServoKeyframesRule.cpp @@ -116,17 +116,17 @@ private: // may be nullptr when the style sheet drops the reference to us. ServoStyleSheet* mStyleSheet = nullptr; ServoKeyframesRule* mParentRule = nullptr; RefPtr<RawServoKeyframesRule> mRawRule; nsCOMArray<css::Rule> mRules; }; // QueryInterface implementation for ServoKeyframeList -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServoKeyframeList) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServoKeyframeList) NS_INTERFACE_MAP_END_INHERITING(dom::CSSRuleList) NS_IMPL_ADDREF_INHERITED(ServoKeyframeList, dom::CSSRuleList) NS_IMPL_RELEASE_INHERITED(ServoKeyframeList, dom::CSSRuleList) NS_IMPL_CYCLE_COLLECTION_CLASS(ServoKeyframeList) NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(ServoKeyframeList) @@ -159,17 +159,17 @@ ServoKeyframesRule::ServoKeyframesRule(R ServoKeyframesRule::~ServoKeyframesRule() { } NS_IMPL_ADDREF_INHERITED(ServoKeyframesRule, dom::CSSKeyframesRule) NS_IMPL_RELEASE_INHERITED(ServoKeyframesRule, dom::CSSKeyframesRule) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServoKeyframesRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServoKeyframesRule) NS_INTERFACE_MAP_END_INHERITING(dom::CSSKeyframesRule) NS_IMPL_CYCLE_COLLECTION_CLASS(ServoKeyframesRule) NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(ServoKeyframesRule, dom::CSSKeyframesRule) if (tmp->mKeyframeList) { tmp->mKeyframeList->DropReference();
--- a/layout/style/ServoMediaRule.cpp +++ b/layout/style/ServoMediaRule.cpp @@ -25,17 +25,17 @@ ServoMediaRule::ServoMediaRule(RefPtr<Ra ServoMediaRule::~ServoMediaRule() { } NS_IMPL_ADDREF_INHERITED(ServoMediaRule, CSSMediaRule) NS_IMPL_RELEASE_INHERITED(ServoMediaRule, CSSMediaRule) // QueryInterface implementation for MediaRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServoMediaRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServoMediaRule) NS_INTERFACE_MAP_END_INHERITING(CSSMediaRule) NS_IMPL_CYCLE_COLLECTION_INHERITED(ServoMediaRule, CSSMediaRule, mMediaList) /* virtual */ already_AddRefed<css::Rule> ServoMediaRule::Clone() const {
--- a/layout/style/ServoPageRule.cpp +++ b/layout/style/ServoPageRule.cpp @@ -115,17 +115,17 @@ ServoPageRule::ServoPageRule(RefPtr<RawS ServoPageRule::~ServoPageRule() { } NS_IMPL_ADDREF_INHERITED(ServoPageRule, CSSPageRule) NS_IMPL_RELEASE_INHERITED(ServoPageRule, CSSPageRule) // QueryInterface implementation for PageRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServoPageRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServoPageRule) NS_INTERFACE_MAP_END_INHERITING(CSSPageRule) NS_IMPL_CYCLE_COLLECTION_CLASS(ServoPageRule) NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(ServoPageRule, CSSPageRule) // Keep this in sync with IsCCLeaf. // Trace the wrapper for our declaration. This just expands out
--- a/layout/style/ServoStyleRule.cpp +++ b/layout/style/ServoStyleRule.cpp @@ -114,17 +114,17 @@ ServoStyleRule::ServoStyleRule(already_A uint32_t aLine, uint32_t aColumn) : BindingStyleRule(aLine, aColumn) , mRawRule(aRawRule) , mDecls(Servo_StyleRule_GetStyle(mRawRule).Consume()) { } // QueryInterface implementation for ServoStyleRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServoStyleRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServoStyleRule) NS_INTERFACE_MAP_ENTRY(nsICSSStyleRuleDOMWrapper) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSStyleRule) NS_INTERFACE_MAP_END_INHERITING(css::Rule) NS_IMPL_ADDREF_INHERITED(ServoStyleRule, css::Rule) NS_IMPL_RELEASE_INHERITED(ServoStyleRule, css::Rule) NS_IMPL_CYCLE_COLLECTION_CLASS(ServoStyleRule)
--- a/layout/style/ServoStyleSheet.cpp +++ b/layout/style/ServoStyleSheet.cpp @@ -163,17 +163,17 @@ ServoStyleSheet::~ServoStyleSheet() void ServoStyleSheet::LastRelease() { DropRuleList(); } // QueryInterface implementation for ServoStyleSheet -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServoStyleSheet) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServoStyleSheet) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMCSSStyleSheet) if (aIID.Equals(NS_GET_IID(ServoStyleSheet))) foundInterface = reinterpret_cast<nsISupports*>(this); else NS_INTERFACE_MAP_END_INHERITING(StyleSheet) NS_IMPL_ADDREF_INHERITED(ServoStyleSheet, StyleSheet) NS_IMPL_RELEASE_INHERITED(ServoStyleSheet, StyleSheet)
--- a/layout/style/ServoSupportsRule.cpp +++ b/layout/style/ServoSupportsRule.cpp @@ -25,17 +25,17 @@ ServoSupportsRule::ServoSupportsRule(Ref ServoSupportsRule::~ServoSupportsRule() { } NS_IMPL_ADDREF_INHERITED(ServoSupportsRule, CSSSupportsRule) NS_IMPL_RELEASE_INHERITED(ServoSupportsRule, CSSSupportsRule) // QueryInterface implementation for SupportsRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServoSupportsRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServoSupportsRule) NS_INTERFACE_MAP_END_INHERITING(CSSSupportsRule) /* virtual */ already_AddRefed<css::Rule> ServoSupportsRule::Clone() const { // Rule::Clone is only used when CSSStyleSheetInner is cloned in // preparation of being mutated. However, ServoStyleSheet never clones // anything, so this method should never be called.
--- a/layout/style/StyleRule.cpp +++ b/layout/style/StyleRule.cpp @@ -1237,17 +1237,17 @@ void StyleRule::DropReferences() { if (mDeclaration) { mDeclaration->SetOwningRule(nullptr); } } // 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(); return NS_OK; } else NS_INTERFACE_MAP_ENTRY(nsICSSStyleRuleDOMWrapper) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSStyleRule)
--- a/layout/style/nsCSSRules.cpp +++ b/layout/style/nsCSSRules.cpp @@ -209,17 +209,17 @@ ImportRule::~ImportRule() } NS_IMPL_ADDREF_INHERITED(ImportRule, CSSImportRule) NS_IMPL_RELEASE_INHERITED(ImportRule, CSSImportRule) NS_IMPL_CYCLE_COLLECTION_INHERITED(ImportRule, CSSImportRule, mMedia, mChildSheet) // QueryInterface implementation for ImportRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ImportRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ImportRule) NS_INTERFACE_MAP_END_INHERITING(CSSImportRule) #ifdef DEBUG /* virtual */ void ImportRule::List(FILE* out, int32_t aIndent) const { nsAutoCString str; // Indent @@ -333,17 +333,17 @@ MediaRule::~MediaRule() mMedia->SetStyleSheet(nullptr); } } NS_IMPL_ADDREF_INHERITED(MediaRule, CSSMediaRule) NS_IMPL_RELEASE_INHERITED(MediaRule, CSSMediaRule) // QueryInterface implementation for MediaRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaRule) NS_INTERFACE_MAP_END_INHERITING(CSSMediaRule) NS_IMPL_CYCLE_COLLECTION_INHERITED(MediaRule, CSSMediaRule, mMedia) /* virtual */ void MediaRule::SetStyleSheet(StyleSheet* aSheet) { @@ -1123,17 +1123,17 @@ nsCSSFontFaceRule::IsCCLeaf() const if (!Rule::IsCCLeaf()) { return false; } return !mDecl.PreservingWrapper(); } // 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) #ifdef DEBUG void nsCSSFontFaceRule::List(FILE* out, int32_t aIndent) const { nsCString baseInd, descInd; @@ -1559,17 +1559,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END bool nsCSSKeyframeRule::IsCCLeaf() const { // Let's not worry about figuring out whether we're a leaf or not. return false; } // QueryInterface implementation for nsCSSKeyframeRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsCSSKeyframeRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCSSKeyframeRule) NS_INTERFACE_MAP_END_INHERITING(dom::CSSKeyframeRule) #ifdef DEBUG void nsCSSKeyframeRule::List(FILE* out, int32_t aIndent) const { nsAutoCString str; for (int32_t index = aIndent; --index >= 0; ) { @@ -2004,17 +2004,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END bool nsCSSPageRule::IsCCLeaf() const { // Let's not worry about figuring out whether we're a leaf or not. return false; } // QueryInterface implementation for nsCSSPageRule -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsCSSPageRule) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCSSPageRule) NS_INTERFACE_MAP_END_INHERITING(dom::CSSPageRule) #ifdef DEBUG void nsCSSPageRule::List(FILE* out, int32_t aIndent) const { nsAutoCString str; for (int32_t indent = aIndent; --indent >= 0; ) {
--- a/layout/xul/tree/TreeBoxObject.cpp +++ b/layout/xul/tree/TreeBoxObject.cpp @@ -25,17 +25,17 @@ namespace mozilla { namespace dom { NS_IMPL_CYCLE_COLLECTION_INHERITED(TreeBoxObject, BoxObject, mView) 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) void TreeBoxObject::Clear() { ClearCachedValues();
--- a/parser/html/nsHtml5DocumentBuilder.cpp +++ b/parser/html/nsHtml5DocumentBuilder.cpp @@ -10,17 +10,17 @@ #include "nsStyleLinkElement.h" #include "nsIHTMLDocument.h" #include "nsNameSpaceManager.h" #include "mozilla/dom/ScriptLoader.h" 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) NS_IMPL_RELEASE_INHERITED(nsHtml5DocumentBuilder, nsContentSink) nsHtml5DocumentBuilder::nsHtml5DocumentBuilder(bool aRunsToCompletion) : mBroken(NS_OK) , mFlushState(eHtml5FlushState::eNotFlushing)
--- a/toolkit/components/places/nsNavHistoryResult.cpp +++ b/toolkit/components/places/nsNavHistoryResult.cpp @@ -332,17 +332,17 @@ nsNavHistoryResultNode::GetGeneratingOpt NS_IMPL_CYCLE_COLLECTION_INHERITED(nsNavHistoryContainerResultNode, nsNavHistoryResultNode, mResult, mChildren) 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) nsNavHistoryContainerResultNode::nsNavHistoryContainerResultNode( const nsACString& aURI, const nsACString& aTitle, uint32_t aContainerType, nsNavHistoryQueryOptions* aOptions) : nsNavHistoryResultNode(aURI, aTitle, 0, 0),
--- a/xpcom/base/nsCycleCollectionParticipant.h +++ b/xpcom/base/nsCycleCollectionParticipant.h @@ -313,19 +313,16 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsXPCOMCyc foundInterface = nullptr; \ } \ } else #define NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(_class) \ 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; \ NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(_class) // The IIDs for nsXPCOMCycleCollectionParticipant and nsCycleCollectionISupports // are special in that they only differ in their last byte. This allows for the // optimization below where we first check the first three words of the IID and