Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 900903 - Part 2: Change uses of numbered macros in nsCycleCollectionParticipant.h to the variadic variants. r=smaug

Browse Source
This commit is contained in:
Birunthan Mohanathas 2014-04-25 12:49:00 -04:00
parent 155ee10cf7
commit 7ac92ae5ea
157 changed files with 419 additions and 419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessible/src/base/AccEvent.cpp
View File

@ -41,7 +41,7 @@ AccEvent::AccEvent(uint32_t aEventType, Accessible* aAccessible,
////////////////////////////////////////////////////////////////////////////////
// AccEvent cycle collection
NS_IMPL_CYCLE_COLLECTION_1(AccEvent, mAccessible)
NS_IMPL_CYCLE_COLLECTION(AccEvent, mAccessible)
NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(AccEvent, AddRef)
NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(AccEvent, Release)

4
accessible/src/base/NotificationController.cpp
View File

@ -408,8 +408,8 @@ NotificationController::ContentInsertion::
return haveToUpdate;
}
NS_IMPL_CYCLE_COLLECTION_1(NotificationController::ContentInsertion,
mContainer)
NS_IMPL_CYCLE_COLLECTION(NotificationController::ContentInsertion,
mContainer)
NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(NotificationController::ContentInsertion,
AddRef)

2
accessible/src/base/nsAccessiblePivot.cpp
View File

@ -48,7 +48,7 @@ nsAccessiblePivot::nsAccessiblePivot(Accessible* aRoot) :
////////////////////////////////////////////////////////////////////////////////
// nsISupports
NS_IMPL_CYCLE_COLLECTION_3(nsAccessiblePivot, mRoot, mPosition, mObservers)
NS_IMPL_CYCLE_COLLECTION(nsAccessiblePivot, mRoot, mPosition, mObservers)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsAccessiblePivot)
NS_INTERFACE_MAP_ENTRY(nsIAccessiblePivot)

4
accessible/src/generic/Accessible.cpp
View File

@ -91,8 +91,8 @@ using namespace mozilla::a11y;
////////////////////////////////////////////////////////////////////////////////
// Accessible: nsISupports and cycle collection
NS_IMPL_CYCLE_COLLECTION_3(Accessible,
mContent, mParent, mChildren)
NS_IMPL_CYCLE_COLLECTION(Accessible,
mContent, mParent, mChildren)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Accessible)
NS_INTERFACE_MAP_ENTRY(nsIAccessible)

2
accessible/src/xpcom/AccEventGen.py
View File

@ -176,7 +176,7 @@ def write_cpp(eventname, iface, fd):
classname = "xpcAcc%s" % eventname
attributes = allAttributes(iface)
ccattributes = filter(lambda m: m.realtype.nativeType('in').endswith('*'), attributes)
fd.write("NS_IMPL_CYCLE_COLLECTION_%u(%s" % (len(ccattributes), classname))
fd.write("NS_IMPL_CYCLE_COLLECTION(%s" % classname)
for c in ccattributes:
fd.write(", m%s" % firstCap(c.name))
fd.write(")\n\n");

8
accessible/src/xpcom/xpcAccessibleTextRange.cpp
View File

@ -14,10 +14,10 @@ using namespace mozilla::a11y;
// nsISupports and cycle collection
NS_IMPL_CYCLE_COLLECTION_3(xpcAccessibleTextRange,
mRange.mRoot,
mRange.mStartContainer,
mRange.mEndContainer)
NS_IMPL_CYCLE_COLLECTION(xpcAccessibleTextRange,
mRange.mRoot,
mRange.mStartContainer,
mRange.mEndContainer)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(xpcAccessibleTextRange)
NS_INTERFACE_MAP_ENTRY(nsIAccessibleTextRange)

14
accessible/src/xul/XULTreeAccessible.cpp
View File

@ -65,8 +65,8 @@ XULTreeAccessible::
////////////////////////////////////////////////////////////////////////////////
// XULTreeAccessible: nsISupports and cycle collection implementation
NS_IMPL_CYCLE_COLLECTION_INHERITED_2(XULTreeAccessible, Accessible,
mTree, mAccessibleCache)
NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeAccessible, Accessible,
mTree, mAccessibleCache)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(XULTreeAccessible)
NS_INTERFACE_MAP_END_INHERITING(Accessible)
@ -706,8 +706,8 @@ XULTreeItemAccessibleBase::
////////////////////////////////////////////////////////////////////////////////
// XULTreeItemAccessibleBase: nsISupports implementation
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(XULTreeItemAccessibleBase, Accessible,
mTree)
NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeItemAccessibleBase, Accessible,
mTree)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(XULTreeItemAccessibleBase)
NS_INTERFACE_TABLE_INHERITED1(XULTreeItemAccessibleBase,
@ -1106,9 +1106,9 @@ XULTreeItemAccessible::
////////////////////////////////////////////////////////////////////////////////
// XULTreeItemAccessible: nsISupports implementation
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(XULTreeItemAccessible,
XULTreeItemAccessibleBase,
mColumn)
NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeItemAccessible,
XULTreeItemAccessibleBase,
mColumn)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(XULTreeItemAccessible)
NS_INTERFACE_MAP_END_INHERITING(XULTreeItemAccessibleBase)

10
accessible/src/xul/XULTreeGridAccessible.cpp
View File

@ -265,9 +265,9 @@ XULTreeGridRowAccessible::
////////////////////////////////////////////////////////////////////////////////
// XULTreeGridRowAccessible: nsISupports and cycle collection implementation
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(XULTreeGridRowAccessible,
XULTreeItemAccessibleBase,
mAccessibleCache)
NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeGridRowAccessible,
XULTreeItemAccessibleBase,
mAccessibleCache)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(XULTreeGridRowAccessible)
NS_INTERFACE_MAP_END_INHERITING(XULTreeItemAccessibleBase)
@ -453,8 +453,8 @@ XULTreeGridCellAccessible::
////////////////////////////////////////////////////////////////////////////////
// XULTreeGridCellAccessible: nsISupports implementation
NS_IMPL_CYCLE_COLLECTION_INHERITED_2(XULTreeGridCellAccessible, LeafAccessible,
mTree, mColumn)
NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeGridCellAccessible, LeafAccessible,
mTree, mColumn)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(XULTreeGridCellAccessible)
NS_INTERFACE_TABLE_INHERITED2(XULTreeGridCellAccessible,

2
content/base/src/DOMQuad.cpp
View File

@ -141,7 +141,7 @@ protected:
nsRefPtr<DOMQuad> mQuad;
};
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(DOMQuad::QuadBounds, DOMRectReadOnly, mQuad)
NS_IMPL_CYCLE_COLLECTION_INHERITED(DOMQuad::QuadBounds, DOMRectReadOnly, mQuad)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DOMQuad::QuadBounds)
NS_INTERFACE_MAP_END_INHERITING(DOMRectReadOnly)

2
content/base/src/EventSource.cpp
View File

@ -521,7 +521,7 @@ private:
nsRefPtr<EventSource> mEventSource;
};
NS_IMPL_CYCLE_COLLECTION_1(AsyncVerifyRedirectCallbackFwr, mEventSource)
NS_IMPL_CYCLE_COLLECTION(AsyncVerifyRedirectCallbackFwr, mEventSource)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AsyncVerifyRedirectCallbackFwr)
NS_INTERFACE_MAP_ENTRY(nsISupports)

4
content/base/src/FragmentOrElement.cpp
View File

@ -428,7 +428,7 @@ nsChildContentList::IndexOf(nsIContent* aContent)
//----------------------------------------------------------------------
NS_IMPL_CYCLE_COLLECTION_1(nsNode3Tearoff, mNode)
NS_IMPL_CYCLE_COLLECTION(nsNode3Tearoff, mNode)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsNode3Tearoff)
NS_INTERFACE_MAP_ENTRY(nsIDOMXPathNSResolver)
@ -483,7 +483,7 @@ nsNodeWeakReference::QueryReferent(const nsIID& aIID, void** aInstancePtr)
}
NS_IMPL_CYCLE_COLLECTION_1(nsNodeSupportsWeakRefTearoff, mNode)
NS_IMPL_CYCLE_COLLECTION(nsNodeSupportsWeakRefTearoff, mNode)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsNodeSupportsWeakRefTearoff)
NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)

4
content/base/src/ShadowRoot.cpp
View File

@ -655,8 +655,8 @@ ShadowRoot::ContentRemoved(nsIDocument* aDocument,
}
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(ShadowRootStyleSheetList, StyleSheetList,
mShadowRoot)
NS_IMPL_CYCLE_COLLECTION_INHERITED(ShadowRootStyleSheetList, StyleSheetList,
mShadowRoot)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ShadowRootStyleSheetList)
NS_INTERFACE_MAP_END_INHERITING(StyleSheetList)

2
content/base/src/TreeWalker.cpp
View File

@ -41,7 +41,7 @@ TreeWalker::~TreeWalker()
* nsISupports and cycle collection stuff
*/
NS_IMPL_CYCLE_COLLECTION_3(TreeWalker, mFilter, mCurrentNode, mRoot)
NS_IMPL_CYCLE_COLLECTION(TreeWalker, mFilter, mCurrentNode, mRoot)
// QueryInterface implementation for TreeWalker
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TreeWalker)

14
content/base/src/nsContentIterator.cpp
View File

@ -211,11 +211,11 @@ NS_INTERFACE_MAP_BEGIN(nsContentIterator)
NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsContentIterator)
NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTION_4(nsContentIterator,
mCurNode,
mFirst,
mLast,
mCommonParent)
NS_IMPL_CYCLE_COLLECTION(nsContentIterator,
mCurNode,
mFirst,
mLast,
mCommonParent)
void
nsContentIterator::LastRelease()
@ -1158,8 +1158,8 @@ NS_IMPL_RELEASE_INHERITED(nsContentSubtreeIterator, nsContentIterator)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsContentSubtreeIterator)
NS_INTERFACE_MAP_END_INHERITING(nsContentIterator)
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(nsContentSubtreeIterator, nsContentIterator,
mRange)
NS_IMPL_CYCLE_COLLECTION_INHERITED(nsContentSubtreeIterator, nsContentIterator,
mRange)
void
nsContentSubtreeIterator::LastRelease()

4
content/base/src/nsContentList.cpp
View File

@ -135,8 +135,8 @@ nsBaseContentList::IndexOf(nsIContent* aContent)
return IndexOf(aContent, true);
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(nsSimpleContentList, nsBaseContentList,
mRoot)
NS_IMPL_CYCLE_COLLECTION_INHERITED(nsSimpleContentList, nsBaseContentList,
mRoot)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsSimpleContentList)
NS_INTERFACE_MAP_END_INHERITING(nsBaseContentList)

4
content/base/src/nsDocumentEncoder.cpp
View File

@ -182,8 +182,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDocumentEncoder)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTION_5(nsDocumentEncoder,
mDocument, mSelection, mRange, mNode, mCommonParent)
NS_IMPL_CYCLE_COLLECTION(nsDocumentEncoder,
mDocument, mSelection, mRange, mNode, mCommonParent)
nsDocumentEncoder::nsDocumentEncoder() : mCachedBuffer(nullptr)
{

2
content/base/src/nsFrameLoader.cpp
View File

@ -250,7 +250,7 @@ nsContentView::GetId(nsContentViewId* aId)
// we'd need to re-institute a fixed version of bug 98158.
#define MAX_DEPTH_CONTENT_FRAMES 10
NS_IMPL_CYCLE_COLLECTION_3(nsFrameLoader, mDocShell, mMessageManager, mChildMessageManager)
NS_IMPL_CYCLE_COLLECTION(nsFrameLoader, mDocShell, mMessageManager, mChildMessageManager)
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsFrameLoader)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsFrameLoader)

8
content/base/src/nsInProcessTabChildGlobal.cpp
View File

@ -143,10 +143,10 @@ nsInProcessTabChildGlobal::Init()
return NS_OK;
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_2(nsInProcessTabChildGlobal,
DOMEventTargetHelper,
mMessageManager,
mGlobal)
NS_IMPL_CYCLE_COLLECTION_INHERITED(nsInProcessTabChildGlobal,
DOMEventTargetHelper,
mMessageManager,
mGlobal)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsInProcessTabChildGlobal)
NS_INTERFACE_MAP_ENTRY(nsIMessageListenerManager)

2
content/base/src/nsObjectLoadingContent.cpp
View File

@ -1157,7 +1157,7 @@ protected:
nsCOMPtr<nsIObjectLoadingContent> mContent;
};
NS_IMPL_CYCLE_COLLECTION_1(ObjectInterfaceRequestorShim, mContent)
NS_IMPL_CYCLE_COLLECTION(ObjectInterfaceRequestorShim, mContent)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ObjectInterfaceRequestorShim)
NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)

4
content/base/src/nsXMLHttpRequest.cpp
View File

@ -3341,7 +3341,7 @@ private:
nsRefPtr<nsXMLHttpRequest> mXHR;
};
NS_IMPL_CYCLE_COLLECTION_1(AsyncVerifyRedirectCallbackForwarder, mXHR)
NS_IMPL_CYCLE_COLLECTION(AsyncVerifyRedirectCallbackForwarder, mXHR)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AsyncVerifyRedirectCallbackForwarder)
NS_INTERFACE_MAP_ENTRY(nsISupports)
@ -3809,7 +3809,7 @@ NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXMLHttpRequestXPCOMifier)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXMLHttpRequestXPCOMifier)
// Can't NS_IMPL_CYCLE_COLLECTION_1 because mXHR has ambiguous
// Can't NS_IMPL_CYCLE_COLLECTION( because mXHR has ambiguous
// inheritance from nsISupports.
NS_IMPL_CYCLE_COLLECTION_CLASS(nsXMLHttpRequestXPCOMifier)

2
content/canvas/src/WebGLUniformLocation.cpp
View File

@ -27,7 +27,7 @@ WebGLUniformLocation::WebGLUniformLocation(WebGLContext *context, WebGLProgram *
mElementSize = info.ElementSize();
}
NS_IMPL_CYCLE_COLLECTION_1(WebGLUniformLocation, mProgram)
NS_IMPL_CYCLE_COLLECTION(WebGLUniformLocation, mProgram)
NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(WebGLUniformLocation, AddRef)
NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(WebGLUniformLocation, Release)

6
content/html/content/src/HTMLButtonElement.cpp
View File

@ -76,9 +76,9 @@ HTMLButtonElement::~HTMLButtonElement()
// nsISupports
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(HTMLButtonElement,
nsGenericHTMLFormElementWithState,
mValidity)
NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLButtonElement,
nsGenericHTMLFormElementWithState,
mValidity)
NS_IMPL_ADDREF_INHERITED(HTMLButtonElement, Element)
NS_IMPL_RELEASE_INHERITED(HTMLButtonElement, Element)

6
content/html/content/src/HTMLCanvasElement.cpp
View File

@ -123,9 +123,9 @@ HTMLCanvasElement::~HTMLCanvasElement()
ResetPrintCallback();
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_4(HTMLCanvasElement, nsGenericHTMLElement,
mCurrentContext, mPrintCallback,
mPrintState, mOriginalCanvas)
NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLCanvasElement, nsGenericHTMLElement,
mCurrentContext, mPrintCallback,
mPrintState, mOriginalCanvas)
NS_IMPL_ADDREF_INHERITED(HTMLCanvasElement, Element)
NS_IMPL_RELEASE_INHERITED(HTMLCanvasElement, Element)

8
content/html/content/src/HTMLContentElement.cpp
View File

@ -31,9 +31,9 @@ HTMLContentElement::~HTMLContentElement()
{
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(HTMLContentElement,
nsGenericHTMLElement,
mMatchedNodes)
NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLContentElement,
nsGenericHTMLElement,
mMatchedNodes)
NS_IMPL_ADDREF_INHERITED(HTMLContentElement, Element)
NS_IMPL_RELEASE_INHERITED(HTMLContentElement, Element)
@ -242,7 +242,7 @@ HTMLContentElement::GetDistributedNodes()
return list.forget();
}
NS_IMPL_CYCLE_COLLECTION_2(DistributedContentList, mParent, mDistributedNodes)
NS_IMPL_CYCLE_COLLECTION(DistributedContentList, mParent, mDistributedNodes)
NS_INTERFACE_TABLE_HEAD(DistributedContentList)
NS_INTERFACE_TABLE1(DistributedContentList, nsINodeList)

4
content/html/content/src/HTMLDataListElement.cpp
View File

@ -21,8 +21,8 @@ HTMLDataListElement::WrapNode(JSContext *aCx)
return HTMLDataListElementBinding::Wrap(aCx, this);
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(HTMLDataListElement, nsGenericHTMLElement,
mOptions)
NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLDataListElement, nsGenericHTMLElement,
mOptions)
NS_IMPL_ADDREF_INHERITED(HTMLDataListElement, Element)
NS_IMPL_RELEASE_INHERITED(HTMLDataListElement, Element)

4
content/html/content/src/HTMLFieldSetElement.cpp
View File

@ -38,8 +38,8 @@ HTMLFieldSetElement::~HTMLFieldSetElement()
// nsISupports
NS_IMPL_CYCLE_COLLECTION_INHERITED_2(HTMLFieldSetElement, nsGenericHTMLFormElement,
mValidity, mElements)
NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLFieldSetElement, nsGenericHTMLFormElement,
mValidity, mElements)
NS_IMPL_ADDREF_INHERITED(HTMLFieldSetElement, Element)
NS_IMPL_RELEASE_INHERITED(HTMLFieldSetElement, Element)

4
content/html/content/src/HTMLPropertiesCollection.cpp
View File

@ -495,8 +495,8 @@ PropertyStringList::PropertyStringList(HTMLPropertiesCollection* aCollection)
, mCollection(aCollection)
{ }
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(PropertyStringList, DOMStringList,
mCollection)
NS_IMPL_CYCLE_COLLECTION_INHERITED(PropertyStringList, DOMStringList,
mCollection)
NS_IMPL_ADDREF_INHERITED(PropertyStringList, DOMStringList)
NS_IMPL_RELEASE_INHERITED(PropertyStringList, DOMStringList)

10
content/html/content/src/HTMLTextAreaElement.cpp
View File

@ -75,11 +75,11 @@ HTMLTextAreaElement::HTMLTextAreaElement(already_AddRefed<nsINodeInfo>& aNodeInf
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_3(HTMLTextAreaElement,
nsGenericHTMLFormElementWithState,
mValidity,
mControllers,
mState)
NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLTextAreaElement,
nsGenericHTMLFormElementWithState,
mValidity,
mControllers,
mState)
NS_IMPL_ADDREF_INHERITED(HTMLTextAreaElement, Element)
NS_IMPL_RELEASE_INHERITED(HTMLTextAreaElement, Element)

6
content/html/content/src/HTMLTrackElement.cpp
View File

@ -94,9 +94,9 @@ NS_IMPL_ELEMENT_CLONE(HTMLTrackElement)
NS_IMPL_ADDREF_INHERITED(HTMLTrackElement, Element)
NS_IMPL_RELEASE_INHERITED(HTMLTrackElement, Element)
NS_IMPL_CYCLE_COLLECTION_INHERITED_4(HTMLTrackElement, nsGenericHTMLElement,
mTrack, mChannel, mMediaParent,
mListener)
NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLTrackElement, nsGenericHTMLElement,
mTrack, mChannel, mMediaParent,
mListener)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLTrackElement)
NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement)

4
content/html/content/src/TextTrackManager.cpp
View File

@ -75,8 +75,8 @@ CompareTextTracks::LessThan(TextTrack* aOne, TextTrack* aTwo) const
return true;
}
NS_IMPL_CYCLE_COLLECTION_4(TextTrackManager, mMediaElement, mTextTracks,
mPendingTextTracks, mNewCues)
NS_IMPL_CYCLE_COLLECTION(TextTrackManager, mMediaElement, mTextTracks,
mPendingTextTracks, mNewCues)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TextTrackManager)
NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener)

12
content/html/content/src/UndoManager.cpp
View File

@ -119,7 +119,7 @@ protected:
nsString mUndoValue;
};
NS_IMPL_CYCLE_COLLECTION_2(UndoAttrChanged, mElement, mAttrAtom)
NS_IMPL_CYCLE_COLLECTION(UndoAttrChanged, mElement, mAttrAtom)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(UndoAttrChanged)
NS_INTERFACE_MAP_ENTRY(nsITransaction)
@ -225,7 +225,7 @@ protected:
nsString mUndoValue;
};
NS_IMPL_CYCLE_COLLECTION_1(UndoTextChanged, mContent)
NS_IMPL_CYCLE_COLLECTION(UndoTextChanged, mContent)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(UndoTextChanged)
NS_INTERFACE_MAP_ENTRY(nsITransaction)
@ -334,7 +334,7 @@ protected:
nsCOMArray<nsIContent> mChildren;
};
NS_IMPL_CYCLE_COLLECTION_2(UndoContentAppend, mContent, mChildren)
NS_IMPL_CYCLE_COLLECTION(UndoContentAppend, mContent, mChildren)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(UndoContentAppend)
NS_INTERFACE_MAP_ENTRY(nsITransaction)
@ -405,7 +405,7 @@ protected:
nsCOMPtr<nsIContent> mNextNode;
};
NS_IMPL_CYCLE_COLLECTION_3(UndoContentInsert, mContent, mChild, mNextNode)
NS_IMPL_CYCLE_COLLECTION(UndoContentInsert, mContent, mChild, mNextNode)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(UndoContentInsert)
NS_INTERFACE_MAP_ENTRY(nsITransaction)
@ -493,7 +493,7 @@ protected:
nsCOMPtr<nsIContent> mNextNode;
};
NS_IMPL_CYCLE_COLLECTION_3(UndoContentRemove, mContent, mChild, mNextNode)
NS_IMPL_CYCLE_COLLECTION(UndoContentRemove, mContent, mChild, mNextNode)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(UndoContentRemove)
NS_INTERFACE_MAP_ENTRY(nsITransaction)
@ -741,7 +741,7 @@ protected:
uint32_t mFlags;
};
NS_IMPL_CYCLE_COLLECTION_1(FunctionCallTxn, mTransaction)
NS_IMPL_CYCLE_COLLECTION(FunctionCallTxn, mTransaction)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FunctionCallTxn)
NS_INTERFACE_MAP_ENTRY(nsITransaction)

2
content/html/content/src/nsGenericHTMLElement.cpp
View File

@ -189,7 +189,7 @@ private:
nsRefPtr<nsGenericHTMLElement> mElement;
};
NS_IMPL_CYCLE_COLLECTION_1(nsGenericHTMLElementTearoff, mElement)
NS_IMPL_CYCLE_COLLECTION(nsGenericHTMLElementTearoff, mElement)
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsGenericHTMLElementTearoff)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsGenericHTMLElementTearoff)

2
content/html/content/src/nsTextEditorState.cpp
View File

@ -256,7 +256,7 @@ NS_INTERFACE_TABLE_HEAD(nsTextInputSelectionImpl)
NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsTextInputSelectionImpl)
NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTION_2(nsTextInputSelectionImpl, mFrameSelection, mLimiter)
NS_IMPL_CYCLE_COLLECTION(nsTextInputSelectionImpl, mFrameSelection, mLimiter)
// BEGIN nsTextInputSelectionImpl

4
content/html/document/src/ImageDocument.cpp
View File

@ -147,8 +147,8 @@ ImageDocument::~ImageDocument()
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(ImageDocument, MediaDocument,
mImageContent)
NS_IMPL_CYCLE_COLLECTION_INHERITED(ImageDocument, MediaDocument,
mImageContent)
NS_IMPL_ADDREF_INHERITED(ImageDocument, MediaDocument)
NS_IMPL_RELEASE_INHERITED(ImageDocument, MediaDocument)

4
content/html/document/src/PluginDocument.cpp
View File

@ -109,8 +109,8 @@ PluginDocument::~PluginDocument()
{}
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(PluginDocument, MediaDocument,
mPluginContent)
NS_IMPL_CYCLE_COLLECTION_INHERITED(PluginDocument, MediaDocument,
mPluginContent)
NS_IMPL_ADDREF_INHERITED(PluginDocument, MediaDocument)
NS_IMPL_RELEASE_INHERITED(PluginDocument, MediaDocument)

24
content/html/document/src/nsHTMLDocument.cpp
View File

@ -199,18 +199,18 @@ nsHTMLDocument::~nsHTMLDocument()
{
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_11(nsHTMLDocument, nsDocument,
mAll,
mImages,
mApplets,
mEmbeds,
mLinks,
mAnchors,
mScripts,
mForms,
mFormControls,
mWyciwygChannel,
mMidasCommandManager)
NS_IMPL_CYCLE_COLLECTION_INHERITED(nsHTMLDocument, nsDocument,
mAll,
mImages,
mApplets,
mEmbeds,
mLinks,
mAnchors,
mScripts,
mForms,
mFormControls,
mWyciwygChannel,
mMidasCommandManager)
NS_IMPL_ADDREF_INHERITED(nsHTMLDocument, nsDocument)
NS_IMPL_RELEASE_INHERITED(nsHTMLDocument, nsDocument)

4
content/media/DOMMediaStream.cpp
View File

@ -44,8 +44,8 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(DOMMediaStream)
NS_IMPL_ISUPPORTS_INHERITED1(DOMLocalMediaStream, DOMMediaStream,
nsIDOMLocalMediaStream)
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(DOMAudioNodeMediaStream, DOMMediaStream,
mStreamNode)
NS_IMPL_CYCLE_COLLECTION_INHERITED(DOMAudioNodeMediaStream, DOMMediaStream,
mStreamNode)
NS_IMPL_ADDREF_INHERITED(DOMAudioNodeMediaStream, DOMMediaStream)
NS_IMPL_RELEASE_INHERITED(DOMAudioNodeMediaStream, DOMMediaStream)

4
content/media/MediaRecorder.cpp
View File

@ -33,8 +33,8 @@ namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(MediaRecorder, DOMEventTargetHelper,
mStream)
NS_IMPL_CYCLE_COLLECTION_INHERITED(MediaRecorder, DOMEventTargetHelper,
mStream)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaRecorder)
NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper)

4
content/media/MediaStreamTrack.cpp
View File

@ -31,8 +31,8 @@ MediaStreamTrack::~MediaStreamTrack()
{
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(MediaStreamTrack, DOMEventTargetHelper,
mStream)
NS_IMPL_CYCLE_COLLECTION_INHERITED(MediaStreamTrack, DOMEventTargetHelper,
mStream)
NS_IMPL_ADDREF_INHERITED(MediaStreamTrack, DOMEventTargetHelper)
NS_IMPL_RELEASE_INHERITED(MediaStreamTrack, DOMEventTargetHelper)

12
content/media/TextTrack.cpp
View File

@ -16,12 +16,12 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_4(TextTrack,
DOMEventTargetHelper,
mCueList,
mActiveCueList,
mTextTrackList,
mTrackElement)
NS_IMPL_CYCLE_COLLECTION_INHERITED(TextTrack,
DOMEventTargetHelper,
mCueList,
mActiveCueList,
mTextTrackList,
mTrackElement)
NS_IMPL_ADDREF_INHERITED(TextTrack, DOMEventTargetHelper)
NS_IMPL_RELEASE_INHERITED(TextTrack, DOMEventTargetHelper)

14
content/media/TextTrackCue.cpp
View File

@ -12,13 +12,13 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_5(TextTrackCue,
DOMEventTargetHelper,
mDocument,
mTrack,
mTrackElement,
mDisplayState,
mRegion)
NS_IMPL_CYCLE_COLLECTION_INHERITED(TextTrackCue,
DOMEventTargetHelper,
mDocument,
mTrack,
mTrackElement,
mDisplayState,
mRegion)
NS_IMPL_ADDREF_INHERITED(TextTrackCue, DOMEventTargetHelper)
NS_IMPL_RELEASE_INHERITED(TextTrackCue, DOMEventTargetHelper)

8
content/media/TextTrackList.cpp
View File

@ -13,10 +13,10 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_2(TextTrackList,
DOMEventTargetHelper,
mTextTracks,
mTextTrackManager)
NS_IMPL_CYCLE_COLLECTION_INHERITED(TextTrackList,
DOMEventTargetHelper,
mTextTracks,
mTextTrackManager)
NS_IMPL_ADDREF_INHERITED(TextTrackList, DOMEventTargetHelper)
NS_IMPL_RELEASE_INHERITED(TextTrackList, DOMEventTargetHelper)

2
content/media/WebVTTListener.cpp
View File

@ -15,7 +15,7 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_2(WebVTTListener, mElement, mParserWrapper)
NS_IMPL_CYCLE_COLLECTION(WebVTTListener, mElement, mParserWrapper)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(WebVTTListener)
NS_INTERFACE_MAP_ENTRY(nsIWebVTTListener)

4
content/media/mediasource/MediaSource.cpp
View File

@ -390,8 +390,8 @@ MediaSource::NotifyEvicted(double aStart, double aEnd)
mSourceBuffers->Evict(aStart, aEnd);
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_2(MediaSource, DOMEventTargetHelper,
mSourceBuffers, mActiveSourceBuffers)
NS_IMPL_CYCLE_COLLECTION_INHERITED(MediaSource, DOMEventTargetHelper,
mSourceBuffers, mActiveSourceBuffers)
NS_IMPL_ADDREF_INHERITED(MediaSource, DOMEventTargetHelper)
NS_IMPL_RELEASE_INHERITED(MediaSource, DOMEventTargetHelper)

4
content/media/mediasource/SourceBuffer.cpp
View File

@ -499,8 +499,8 @@ SourceBuffer::ContainsTime(double aTime)
return aTime >= start && aTime <= end;
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(SourceBuffer, DOMEventTargetHelper,
mMediaSource)
NS_IMPL_CYCLE_COLLECTION_INHERITED(SourceBuffer, DOMEventTargetHelper,
mMediaSource)
NS_IMPL_ADDREF_INHERITED(SourceBuffer, DOMEventTargetHelper)
NS_IMPL_RELEASE_INHERITED(SourceBuffer, DOMEventTargetHelper)

4
content/media/mediasource/SourceBufferList.cpp
View File

@ -164,8 +164,8 @@ SourceBufferList::WrapObject(JSContext* aCx)
return SourceBufferListBinding::Wrap(aCx, this);
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_2(SourceBufferList, DOMEventTargetHelper,
mMediaSource, mSourceBuffers)
NS_IMPL_CYCLE_COLLECTION_INHERITED(SourceBufferList, DOMEventTargetHelper,
mMediaSource, mSourceBuffers)
NS_IMPL_ADDREF_INHERITED(SourceBufferList, DOMEventTargetHelper)
NS_IMPL_RELEASE_INHERITED(SourceBufferList, DOMEventTargetHelper)

4
content/media/webaudio/AudioDestinationNode.cpp
View File

@ -214,8 +214,8 @@ static bool UseAudioChannelService()
return Preferences::GetBool("media.useAudioChannelService");
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(AudioDestinationNode, AudioNode,
mAudioChannelAgent)
NS_IMPL_CYCLE_COLLECTION_INHERITED(AudioDestinationNode, AudioNode,
mAudioChannelAgent)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(AudioDestinationNode)
NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener)

4
content/media/webaudio/AudioProcessingEvent.cpp
View File

@ -11,8 +11,8 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_3(AudioProcessingEvent, Event,
mInputBuffer, mOutputBuffer, mNode)
NS_IMPL_CYCLE_COLLECTION_INHERITED(AudioProcessingEvent, Event,
mInputBuffer, mOutputBuffer, mNode)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(AudioProcessingEvent)
NS_INTERFACE_MAP_END_INHERITING(Event)

4
content/media/webaudio/BiquadFilterNode.cpp
View File

@ -17,8 +17,8 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_4(BiquadFilterNode, AudioNode,
mFrequency, mDetune, mQ, mGain)
NS_IMPL_CYCLE_COLLECTION_INHERITED(BiquadFilterNode, AudioNode,
mFrequency, mDetune, mQ, mGain)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(BiquadFilterNode)
NS_INTERFACE_MAP_END_INHERITING(AudioNode)

2
content/media/webaudio/ConvolverNode.cpp
View File

@ -14,7 +14,7 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(ConvolverNode, AudioNode, mBuffer)
NS_IMPL_CYCLE_COLLECTION_INHERITED(ConvolverNode, AudioNode, mBuffer)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ConvolverNode)
NS_INTERFACE_MAP_END_INHERITING(AudioNode)

4
content/media/webaudio/DelayNode.cpp
View File

@ -16,8 +16,8 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(DelayNode, AudioNode,
mDelay)
NS_IMPL_CYCLE_COLLECTION_INHERITED(DelayNode, AudioNode,
mDelay)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DelayNode)
NS_INTERFACE_MAP_END_INHERITING(AudioNode)

14
content/media/webaudio/DynamicsCompressorNode.cpp
View File

@ -17,13 +17,13 @@ using WebCore::DynamicsCompressor;
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_6(DynamicsCompressorNode, AudioNode,
mThreshold,
mKnee,
mRatio,
mReduction,
mAttack,
mRelease)
NS_IMPL_CYCLE_COLLECTION_INHERITED(DynamicsCompressorNode, AudioNode,
mThreshold,
mKnee,
mRatio,
mReduction,
mAttack,
mRelease)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DynamicsCompressorNode)
NS_INTERFACE_MAP_END_INHERITING(AudioNode)

4
content/media/webaudio/GainNode.cpp
View File

@ -14,8 +14,8 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(GainNode, AudioNode,
mGain)
NS_IMPL_CYCLE_COLLECTION_INHERITED(GainNode, AudioNode,
mGain)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(GainNode)
NS_INTERFACE_MAP_END_INHERITING(AudioNode)

2
content/media/webaudio/MediaStreamAudioDestinationNode.cpp
View File

@ -15,7 +15,7 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(MediaStreamAudioDestinationNode, AudioNode, mDOMStream)
NS_IMPL_CYCLE_COLLECTION_INHERITED(MediaStreamAudioDestinationNode, AudioNode, mDOMStream)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaStreamAudioDestinationNode)
NS_INTERFACE_MAP_END_INHERITING(AudioNode)

4
content/media/webaudio/OfflineAudioCompletionEvent.cpp
View File

@ -11,8 +11,8 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(OfflineAudioCompletionEvent, Event,
mRenderedBuffer)
NS_IMPL_CYCLE_COLLECTION_INHERITED(OfflineAudioCompletionEvent, Event,
mRenderedBuffer)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(OfflineAudioCompletionEvent)
NS_INTERFACE_MAP_END_INHERITING(Event)

4
content/media/webaudio/OscillatorNode.cpp
View File

@ -14,8 +14,8 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_3(OscillatorNode, AudioNode,
mPeriodicWave, mFrequency, mDetune)
NS_IMPL_CYCLE_COLLECTION_INHERITED(OscillatorNode, AudioNode,
mPeriodicWave, mFrequency, mDetune)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(OscillatorNode)
NS_INTERFACE_MAP_END_INHERITING(AudioNode)

4
content/media/webspeech/synth/SpeechSynthesisUtterance.cpp
View File

@ -18,8 +18,8 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(SpeechSynthesisUtterance,
DOMEventTargetHelper, mVoice);
NS_IMPL_CYCLE_COLLECTION_INHERITED(SpeechSynthesisUtterance,
DOMEventTargetHelper, mVoice);
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(SpeechSynthesisUtterance)
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY

2
content/media/webspeech/synth/nsSpeechTask.cpp
View File

@ -81,7 +81,7 @@ private:
// nsSpeechTask
NS_IMPL_CYCLE_COLLECTION_2(nsSpeechTask, mSpeechSynthesis, mUtterance);
NS_IMPL_CYCLE_COLLECTION(nsSpeechTask, mSpeechSynthesis, mUtterance);
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSpeechTask)
NS_INTERFACE_MAP_ENTRY(nsISpeechTask)

2
content/svg/content/src/DOMSVGLength.cpp
View File

@ -24,7 +24,7 @@ static nsSVGAttrTearoffTable<nsSVGLength2, DOMSVGLength>
sBaseSVGLengthTearOffTable,
sAnimSVGLengthTearOffTable;
// We could use NS_IMPL_CYCLE_COLLECTION_1, except that in Unlink() we need to
// We could use NS_IMPL_CYCLE_COLLECTION(, except that in Unlink() we need to
// clear our list's weak ref to us to be safe. (The other option would be to
// not unlink and rely on the breaking of the other edges in the cycle, as
// NS_SVG_VAL_IMPL_CYCLE_COLLECTION does.)

2
content/svg/content/src/DOMSVGLengthList.cpp
View File

@ -35,7 +35,7 @@ void UpdateListIndicesFromIndex(FallibleTArray<DOMSVGLength*>& aItemsArray,
namespace mozilla {
// We could use NS_IMPL_CYCLE_COLLECTION_1, except that in Unlink() we need to
// We could use NS_IMPL_CYCLE_COLLECTION(, except that in Unlink() we need to
// clear our DOMSVGAnimatedLengthList's weak ref to us to be safe. (The other
// option would be to not unlink and rely on the breaking of the other edges in
// the cycle, as NS_SVG_VAL_IMPL_CYCLE_COLLECTION does.)

2
content/svg/content/src/DOMSVGNumber.cpp
View File

@ -16,7 +16,7 @@
namespace mozilla {
// We could use NS_IMPL_CYCLE_COLLECTION_1, except that in Unlink() we need to
// We could use NS_IMPL_CYCLE_COLLECTION(, except that in Unlink() we need to
// clear our list's weak ref to us to be safe. (The other option would be to
// not unlink and rely on the breaking of the other edges in the cycle, as
// NS_SVG_VAL_IMPL_CYCLE_COLLECTION does.)

2
content/svg/content/src/DOMSVGNumberList.cpp
View File

@ -35,7 +35,7 @@ void UpdateListIndicesFromIndex(FallibleTArray<DOMSVGNumber*>& aItemsArray,
namespace mozilla {
// We could use NS_IMPL_CYCLE_COLLECTION_1, except that in Unlink() we need to
// We could use NS_IMPL_CYCLE_COLLECTION(, except that in Unlink() we need to
// clear our DOMSVGAnimatedNumberList's weak ref to us to be safe. (The other
// option would be to not unlink and rely on the breaking of the other edges in
// the cycle, as NS_SVG_VAL_IMPL_CYCLE_COLLECTION does.)

2
content/svg/content/src/DOMSVGPathSeg.cpp
View File

@ -13,7 +13,7 @@
namespace mozilla {
// We could use NS_IMPL_CYCLE_COLLECTION_1, except that in Unlink() we need to
// We could use NS_IMPL_CYCLE_COLLECTION(, except that in Unlink() we need to
// clear our list's weak ref to us to be safe. (The other option would be to
// not unlink and rely on the breaking of the other edges in the cycle, as
// NS_SVG_VAL_IMPL_CYCLE_COLLECTION does.)

2
content/svg/content/src/DOMSVGTransformList.cpp
View File

@ -34,7 +34,7 @@ namespace mozilla {
using namespace dom;
// We could use NS_IMPL_CYCLE_COLLECTION_1, except that in Unlink() we need to
// We could use NS_IMPL_CYCLE_COLLECTION(, except that in Unlink() we need to
// clear our SVGAnimatedTransformList's weak ref to us to be safe. (The other
// option would be to not unlink and rely on the breaking of the other edges in
// the cycle, as NS_SVG_VAL_IMPL_CYCLE_COLLECTION does.)

4
content/svg/content/src/SVGSVGElement.cpp
View File

@ -55,8 +55,8 @@ SVGSVGElement::WrapNode(JSContext *aCx)
return SVGSVGElementBinding::Wrap(aCx, this);
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(DOMSVGTranslatePoint, nsISVGPoint,
mElement)
NS_IMPL_CYCLE_COLLECTION_INHERITED(DOMSVGTranslatePoint, nsISVGPoint,
mElement)
NS_IMPL_ADDREF_INHERITED(DOMSVGTranslatePoint, nsISVGPoint)
NS_IMPL_RELEASE_INHERITED(DOMSVGTranslatePoint, nsISVGPoint)

4
content/svg/content/src/SVGSwitchElement.cpp
View File

@ -26,8 +26,8 @@ SVGSwitchElement::WrapNode(JSContext *aCx)
//----------------------------------------------------------------------
// nsISupports methods
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(SVGSwitchElement, SVGSwitchElementBase,
mActiveChild)
NS_IMPL_CYCLE_COLLECTION_INHERITED(SVGSwitchElement, SVGSwitchElementBase,
mActiveChild)
NS_IMPL_ADDREF_INHERITED(SVGSwitchElement,SVGSwitchElementBase)
NS_IMPL_RELEASE_INHERITED(SVGSwitchElement,SVGSwitchElementBase)

2
content/svg/content/src/SVGTransform.cpp
View File

@ -30,7 +30,7 @@ SVGMatrixTearoffTable()
//----------------------------------------------------------------------
// We could use NS_IMPL_CYCLE_COLLECTION_1, except that in Unlink() we need to
// We could use NS_IMPL_CYCLE_COLLECTION(, except that in Unlink() we need to
// clear our list's weak ref to us to be safe. (The other option would be to
// not unlink and rely on the breaking of the other edges in the cycle, as
// NS_SVG_VAL_IMPL_CYCLE_COLLECTION does.)

2
content/svg/content/src/SVGZoomEvent.cpp
View File

@ -17,7 +17,7 @@ namespace dom {
//----------------------------------------------------------------------
// Implementation
NS_IMPL_CYCLE_COLLECTION_INHERITED_2(SVGZoomEvent, UIEvent, mPreviousTranslate, mNewTranslate)
NS_IMPL_CYCLE_COLLECTION_INHERITED(SVGZoomEvent, UIEvent, mPreviousTranslate, mNewTranslate)
NS_IMPL_ADDREF_INHERITED(SVGZoomEvent, UIEvent)
NS_IMPL_RELEASE_INHERITED(SVGZoomEvent, UIEvent)

2
content/svg/content/src/nsISVGPoint.cpp
View File

@ -14,7 +14,7 @@
using namespace mozilla;
// We could use NS_IMPL_CYCLE_COLLECTION_1, except that in Unlink() we need to
// We could use NS_IMPL_CYCLE_COLLECTION(, except that in Unlink() we need to
// clear our list's weak ref to us to be safe. (The other option would be to
// not unlink and rely on the breaking of the other edges in the cycle, as
// NS_SVG_VAL_IMPL_CYCLE_COLLECTION does.)

4
content/xul/content/src/nsXULContextMenuBuilder.cpp
View File

@ -24,8 +24,8 @@ nsXULContextMenuBuilder::~nsXULContextMenuBuilder()
{
}
NS_IMPL_CYCLE_COLLECTION_4(nsXULContextMenuBuilder, mFragment, mDocument,
mCurrentNode, mElements)
NS_IMPL_CYCLE_COLLECTION(nsXULContextMenuBuilder, mFragment, mDocument,
mCurrentNode, mElements)
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXULContextMenuBuilder)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXULContextMenuBuilder)

2
content/xul/content/src/nsXULElement.cpp
View File

@ -144,7 +144,7 @@ private:
nsCOMPtr<nsIDOMXULElement> mElement;
};
NS_IMPL_CYCLE_COLLECTION_1(nsXULElementTearoff, mElement)
NS_IMPL_CYCLE_COLLECTION(nsXULElementTearoff, mElement)
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXULElementTearoff)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXULElementTearoff)

2
content/xul/content/src/nsXULPopupListener.cpp
View File

@ -66,7 +66,7 @@ nsXULPopupListener::~nsXULPopupListener(void)
ClosePopup();
}
NS_IMPL_CYCLE_COLLECTION_2(nsXULPopupListener, mElement, mPopupContent)
NS_IMPL_CYCLE_COLLECTION(nsXULPopupListener, mElement, mPopupContent)
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXULPopupListener)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXULPopupListener)

2
content/xul/templates/src/nsRDFQuery.cpp
View File

@ -9,7 +9,7 @@
#include "nsXULTemplateQueryProcessorRDF.h"
#include "nsRDFQuery.h"
NS_IMPL_CYCLE_COLLECTION_1(nsRDFQuery, mQueryNode)
NS_IMPL_CYCLE_COLLECTION(nsRDFQuery, mQueryNode)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsRDFQuery)
NS_INTERFACE_MAP_ENTRY(nsITemplateRDFQuery)

2
content/xul/templates/src/nsXULTemplateResultRDF.cpp
View File

@ -9,7 +9,7 @@
// XXXndeakin for some reason, making this class have classinfo breaks trees.
//#include "nsIDOMClassInfo.h"
NS_IMPL_CYCLE_COLLECTION_1(nsXULTemplateResultRDF, mQuery)
NS_IMPL_CYCLE_COLLECTION(nsXULTemplateResultRDF, mQuery)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULTemplateResultRDF)
NS_INTERFACE_MAP_ENTRY(nsIXULTemplateResult)

10
content/xul/templates/src/nsXULTreeBuilder.cpp
View File

@ -273,11 +273,11 @@ NS_NewXULTreeBuilder(nsISupports* aOuter, REFNSIID aIID, void** aResult)
NS_IMPL_ADDREF_INHERITED(nsXULTreeBuilder, nsXULTemplateBuilder)
NS_IMPL_RELEASE_INHERITED(nsXULTreeBuilder, nsXULTemplateBuilder)
NS_IMPL_CYCLE_COLLECTION_INHERITED_4(nsXULTreeBuilder, nsXULTemplateBuilder,
mBoxObject,
mSelection,
mPersistStateStore,
mObservers)
NS_IMPL_CYCLE_COLLECTION_INHERITED(nsXULTreeBuilder, nsXULTemplateBuilder,
mBoxObject,
mSelection,
mPersistStateStore,
mObservers)
DOMCI_DATA(XULTreeBuilder, nsXULTreeBuilder)

4
dom/activities/src/Activity.cpp
View File

@ -18,8 +18,8 @@ NS_INTERFACE_MAP_END_INHERITING(DOMRequest)
NS_IMPL_ADDREF_INHERITED(Activity, DOMRequest)
NS_IMPL_RELEASE_INHERITED(Activity, DOMRequest)
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(Activity, DOMRequest,
mProxy)
NS_IMPL_CYCLE_COLLECTION_INHERITED(Activity, DOMRequest,
mProxy)
NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(Activity, DOMRequest)
NS_IMPL_CYCLE_COLLECTION_TRACE_END

2
dom/audiochannel/AudioChannelAgent.cpp
View File

@ -11,7 +11,7 @@
using namespace mozilla::dom;
NS_IMPL_CYCLE_COLLECTION_2(AudioChannelAgent, mWindow, mCallback)
NS_IMPL_CYCLE_COLLECTION(AudioChannelAgent, mWindow, mCallback)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AudioChannelAgent)
NS_INTERFACE_MAP_ENTRY(nsIAudioChannelAgent)

4
dom/base/DOMCursor.cpp
View File

@ -10,8 +10,8 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(DOMCursor, DOMRequest,
mCallback)
NS_IMPL_CYCLE_COLLECTION_INHERITED(DOMCursor, DOMRequest,
mCallback)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DOMCursor)
NS_INTERFACE_MAP_ENTRY(nsIDOMDOMCursor)

6
dom/base/PerformanceResourceTiming.cpp
View File

@ -8,9 +8,9 @@
using namespace mozilla::dom;
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(PerformanceResourceTiming,
PerformanceEntry,
mTiming)
NS_IMPL_CYCLE_COLLECTION_INHERITED(PerformanceResourceTiming,
PerformanceEntry,
mTiming)
NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(PerformanceResourceTiming,
PerformanceEntry)

14
dom/base/nsFocusManager.cpp
View File

@ -129,13 +129,13 @@ NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsFocusManager)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsFocusManager)
NS_IMPL_CYCLE_COLLECTION_6(nsFocusManager,
mActiveWindow,
mFocusedWindow,
mFocusedContent,
mFirstBlurEvent,
mFirstFocusEvent,
mWindowBeingLowered)
NS_IMPL_CYCLE_COLLECTION(nsFocusManager,
mActiveWindow,
mFocusedWindow,
mFocusedContent,
mFirstBlurEvent,
mFirstFocusEvent,
mWindowBeingLowered)
nsFocusManager* nsFocusManager::sInstance = nullptr;
bool nsFocusManager::sMouseFocusesFormControl = false;

2
dom/base/nsGlobalWindow.cpp
View File

@ -581,7 +581,7 @@ nsPIDOMWindow::nsPIDOMWindow(nsPIDOMWindow *aOuterWindow)
nsPIDOMWindow::~nsPIDOMWindow() {}
// DialogValueHolder CC goop.
NS_IMPL_CYCLE_COLLECTION_1(DialogValueHolder, mValue)
NS_IMPL_CYCLE_COLLECTION(DialogValueHolder, mValue)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DialogValueHolder)
NS_INTERFACE_MAP_ENTRY(nsISupports)

2
dom/bindings/Codegen.py
View File

@ -12025,7 +12025,7 @@ class CGJSImplClass(CGBindingImplClass):
""")
extradefinitions = fill(
"""
NS_IMPL_CYCLE_COLLECTION_INHERITED_2(${ifaceName}, ${parentClass}, mImpl, mParent)
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})

2
dom/bindings/Exceptions.cpp
View File

@ -344,7 +344,7 @@ JSStackFrame::~JSStackFrame()
{
}
NS_IMPL_CYCLE_COLLECTION_2(JSStackFrame, mStackDescription, mCaller)
NS_IMPL_CYCLE_COLLECTION(JSStackFrame, mStackDescription, mCaller)
NS_IMPL_CYCLE_COLLECTING_ADDREF(JSStackFrame)
NS_IMPL_CYCLE_COLLECTING_RELEASE(JSStackFrame)

42
dom/camera/DOMCameraControl.cpp
View File

@ -45,27 +45,27 @@ NS_INTERFACE_MAP_END_INHERITING(DOMMediaStream)
NS_IMPL_ADDREF_INHERITED(nsDOMCameraControl, DOMMediaStream)
NS_IMPL_RELEASE_INHERITED(nsDOMCameraControl, DOMMediaStream)
NS_IMPL_CYCLE_COLLECTION_INHERITED_20(nsDOMCameraControl, DOMMediaStream,
mCapabilities,
mWindow,
mGetCameraOnSuccessCb,
mGetCameraOnErrorCb,
mAutoFocusOnSuccessCb,
mAutoFocusOnErrorCb,
mTakePictureOnSuccessCb,
mTakePictureOnErrorCb,
mStartRecordingOnSuccessCb,
mStartRecordingOnErrorCb,
mReleaseOnSuccessCb,
mReleaseOnErrorCb,
mSetConfigurationOnSuccessCb,
mSetConfigurationOnErrorCb,
mOnShutterCb,
mOnClosedCb,
mOnRecorderStateChangeCb,
mOnPreviewStateChangeCb,
mOnAutoFocusMovingCb,
mOnFacesDetectedCb)
NS_IMPL_CYCLE_COLLECTION_INHERITED(nsDOMCameraControl, DOMMediaStream,
mCapabilities,
mWindow,
mGetCameraOnSuccessCb,
mGetCameraOnErrorCb,
mAutoFocusOnSuccessCb,
mAutoFocusOnErrorCb,
mTakePictureOnSuccessCb,
mTakePictureOnErrorCb,
mStartRecordingOnSuccessCb,
mStartRecordingOnErrorCb,
mReleaseOnSuccessCb,
mReleaseOnErrorCb,
mSetConfigurationOnSuccessCb,
mSetConfigurationOnErrorCb,
mOnShutterCb,
mOnClosedCb,
mOnRecorderStateChangeCb,
mOnPreviewStateChangeCb,
mOnAutoFocusMovingCb,
mOnFacesDetectedCb)
/* static */
bool

2
dom/camera/DOMCameraManager.cpp
View File

@ -174,7 +174,7 @@ protected:
nsRefPtr<CameraErrorCallback> mOnError;
};
NS_IMPL_CYCLE_COLLECTION_3(CameraPermissionRequest, mWindow, mOnSuccess, mOnError)
NS_IMPL_CYCLE_COLLECTION(CameraPermissionRequest, mWindow, mOnSuccess, mOnError)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CameraPermissionRequest)
NS_INTERFACE_MAP_ENTRY(nsIContentPermissionRequest)

2
dom/datastore/DataStore.cpp
View File

@ -22,7 +22,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DataStore)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper)
NS_IMPL_CYCLE_COLLECTION_1(DataStore, mStore)
NS_IMPL_CYCLE_COLLECTION(DataStore, mStore)
DataStore::DataStore(nsPIDOMWindow* aWindow)
: DOMEventTargetHelper(aWindow)

2
dom/datastore/DataStoreCursor.cpp
View File

@ -16,7 +16,7 @@ namespace dom {
NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(DataStoreCursor, AddRef)
NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(DataStoreCursor, Release)
NS_IMPL_CYCLE_COLLECTION_1(DataStoreCursor, mCursor)
NS_IMPL_CYCLE_COLLECTION(DataStoreCursor, mCursor)
already_AddRefed<DataStoreCursor>
DataStoreCursor::Constructor(GlobalObject& aGlobal, ErrorResult& aRv)

14
dom/devicestorage/nsDeviceStorage.cpp
View File

@ -1764,8 +1764,8 @@ NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(DeviceStorageCursorRequest)
NS_IMPL_CYCLE_COLLECTING_RELEASE(DeviceStorageCursorRequest)
NS_IMPL_CYCLE_COLLECTION_1(DeviceStorageCursorRequest,
mCursor)
NS_IMPL_CYCLE_COLLECTION(DeviceStorageCursorRequest,
mCursor)
class PostErrorEvent : public nsRunnable
@ -3083,11 +3083,11 @@ NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(DeviceStorageRequest)
NS_IMPL_CYCLE_COLLECTING_RELEASE(DeviceStorageRequest)
NS_IMPL_CYCLE_COLLECTION_4(DeviceStorageRequest,
mRequest,
mWindow,
mBlob,
mDeviceStorage)
NS_IMPL_CYCLE_COLLECTION(DeviceStorageRequest,
mRequest,
mWindow,
mBlob,
mDeviceStorage)
NS_INTERFACE_MAP_BEGIN(nsDOMDeviceStorage)

8
dom/events/DeviceMotionEvent.cpp
View File

@ -14,10 +14,10 @@ namespace dom {
* DeviceMotionEvent
*****************************************************************************/
NS_IMPL_CYCLE_COLLECTION_INHERITED_3(DeviceMotionEvent, Event,
mAcceleration,
mAccelerationIncludingGravity,
mRotationRate)
NS_IMPL_CYCLE_COLLECTION_INHERITED(DeviceMotionEvent, Event,
mAcceleration,
mAccelerationIncludingGravity,
mRotationRate)
NS_IMPL_ADDREF_INHERITED(DeviceMotionEvent, Event)
NS_IMPL_RELEASE_INHERITED(DeviceMotionEvent, Event)

2
dom/events/EventListenerService.cpp
View File

@ -28,7 +28,7 @@ using namespace dom;
* mozilla::EventListenerInfo
******************************************************************************/
NS_IMPL_CYCLE_COLLECTION_1(EventListenerInfo, mListener)
NS_IMPL_CYCLE_COLLECTION(EventListenerInfo, mListener)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(EventListenerInfo)
NS_INTERFACE_MAP_ENTRY(nsIEventListenerInfo)

44
dom/events/EventStateManager.cpp
View File

@ -242,10 +242,10 @@ OverOutElementsWrapper::~OverOutElementsWrapper()
{
}
NS_IMPL_CYCLE_COLLECTION_3(OverOutElementsWrapper,
mLastOverElement,
mFirstOverEventElement,
mFirstOutEventElement)
NS_IMPL_CYCLE_COLLECTION(OverOutElementsWrapper,
mLastOverElement,
mFirstOverEventElement,
mFirstOutEventElement)
NS_IMPL_CYCLE_COLLECTING_ADDREF(OverOutElementsWrapper)
NS_IMPL_CYCLE_COLLECTING_RELEASE(OverOutElementsWrapper)
@ -413,24 +413,24 @@ NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(EventStateManager)
NS_IMPL_CYCLE_COLLECTING_RELEASE(EventStateManager)
NS_IMPL_CYCLE_COLLECTION_17(EventStateManager,
mCurrentTargetContent,
mGestureDownContent,
mGestureDownFrameOwner,
mLastLeftMouseDownContent,
mLastLeftMouseDownContentParent,
mLastMiddleMouseDownContent,
mLastMiddleMouseDownContentParent,
mLastRightMouseDownContent,
mLastRightMouseDownContentParent,
mActiveContent,
mHoverContent,
mURLTargetContent,
mMouseEnterLeaveHelper,
mPointersEnterLeaveHelper,
mDocument,
mIMEContentObserver,
mAccessKeys)
NS_IMPL_CYCLE_COLLECTION(EventStateManager,
mCurrentTargetContent,
mGestureDownContent,
mGestureDownFrameOwner,
mLastLeftMouseDownContent,
mLastLeftMouseDownContentParent,
mLastMiddleMouseDownContent,
mLastMiddleMouseDownContentParent,
mLastRightMouseDownContent,
mLastRightMouseDownContentParent,
mActiveContent,
mHoverContent,
mURLTargetContent,
mMouseEnterLeaveHelper,
mPointersEnterLeaveHelper,
mDocument,
mIMEContentObserver,
mAccessKeys)
void
EventStateManager::ReleaseCurrentIMEContentObserver()

6
dom/events/IMEContentObserver.cpp
View File

@ -34,9 +34,9 @@ namespace mozilla {
using namespace widget;
NS_IMPL_CYCLE_COLLECTION_5(IMEContentObserver,
mWidget, mSelection,
mRootContent, mEditableNode, mDocShell)
NS_IMPL_CYCLE_COLLECTION(IMEContentObserver,
mWidget, mSelection,
mRootContent, mEditableNode, mDocShell)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(IMEContentObserver)
NS_INTERFACE_MAP_ENTRY(nsISelectionListener)

8
dom/events/TouchEvent.cpp
View File

@ -83,10 +83,10 @@ TouchEvent::TouchEvent(EventTarget* aOwner,
}
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_3(TouchEvent, UIEvent,
mTouches,
mTargetTouches,
mChangedTouches)
NS_IMPL_CYCLE_COLLECTION_INHERITED(TouchEvent, UIEvent,
mTouches,
mTargetTouches,
mChangedTouches)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TouchEvent)
NS_INTERFACE_MAP_END_INHERITING(UIEvent)

4
dom/events/UIEvent.cpp
View File

@ -94,8 +94,8 @@ UIEvent::Constructor(const GlobalObject& aGlobal,
return e.forget();
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(UIEvent, Event,
mView)
NS_IMPL_CYCLE_COLLECTION_INHERITED(UIEvent, Event,
mView)
NS_IMPL_ADDREF_INHERITED(UIEvent, Event)
NS_IMPL_RELEASE_INHERITED(UIEvent, Event)

4
dom/events/XULCommandEvent.cpp
View File

@ -28,8 +28,8 @@ XULCommandEvent::XULCommandEvent(EventTarget* aOwner,
NS_IMPL_ADDREF_INHERITED(XULCommandEvent, UIEvent)
NS_IMPL_RELEASE_INHERITED(XULCommandEvent, UIEvent)
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(XULCommandEvent, UIEvent,
mSourceEvent)
NS_IMPL_CYCLE_COLLECTION_INHERITED(XULCommandEvent, UIEvent,
mSourceEvent)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(XULCommandEvent)
NS_INTERFACE_MAP_ENTRY(nsIDOMXULCommandEvent)

4
dom/file/ArchiveRequest.cpp
View File

@ -269,8 +269,8 @@ ArchiveRequest::Create(nsPIDOMWindow* aOwner,
return request.forget();
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(ArchiveRequest, DOMRequest,
mArchiveReader)
NS_IMPL_CYCLE_COLLECTION_INHERITED(ArchiveRequest, DOMRequest,
mArchiveReader)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ArchiveRequest)
NS_INTERFACE_MAP_END_INHERITING(DOMRequest)

4
dom/file/ArchiveZipFile.cpp
View File

@ -396,8 +396,8 @@ ArchiveZipFile::CreateSlice(uint64_t aStart,
return t.forget();
}
NS_IMPL_CYCLE_COLLECTION_1(ArchiveZipFile,
mArchiveReader)
NS_IMPL_CYCLE_COLLECTION(ArchiveZipFile,
mArchiveReader)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ArchiveZipFile)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFile)

4
dom/file/File.cpp
View File

@ -36,8 +36,8 @@ File::File(const File* aOther, uint64_t aStart, uint64_t aLength,
}
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(File, nsDOMFileCC,
mLockedFile)
NS_IMPL_CYCLE_COLLECTION_INHERITED(File, nsDOMFileCC,
mLockedFile)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(File)
NS_INTERFACE_MAP_END_INHERITING(nsDOMFileCC)

4
dom/file/FileHandle.cpp
View File

@ -55,8 +55,8 @@ private:
} // anonymous namespace
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(FileHandle, DOMEventTargetHelper,
mFileStorage)
NS_IMPL_CYCLE_COLLECTION_INHERITED(FileHandle, DOMEventTargetHelper,
mFileStorage)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(FileHandle)
NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper)

4
dom/file/FileRequest.cpp
View File

@ -96,8 +96,8 @@ FileRequest::NotifyHelperCompleted(FileHelper* aFileHelper)
return NS_OK;
}
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(FileRequest, DOMRequest,
mLockedFile)
NS_IMPL_CYCLE_COLLECTION_INHERITED(FileRequest, DOMRequest,
mLockedFile)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(FileRequest)
NS_INTERFACE_MAP_END_INHERITING(DOMRequest)

Some files were not shown because too many files have changed in this diff Show More