From 1b1e0b258cb826b0e938efd6a03d48fba26cc819 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Tue, 29 Apr 2014 04:57:00 -0400 Subject: [PATCH] Bug 1001966 - Part 2: Change uses of numbered NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE macro to the variadic variant. r=smaug --- content/base/src/DOMImplementation.cpp | 2 +- content/base/src/DOMParser.cpp | 2 +- content/base/src/DOMPoint.cpp | 2 +- content/base/src/DOMQuad.cpp | 4 ++-- content/base/src/DOMRect.cpp | 4 ++-- content/base/src/nsDOMCaretPosition.cpp | 4 ++-- content/base/src/nsDOMMutationObserver.cpp | 10 +++++----- content/base/src/nsDOMSerializer.cpp | 2 +- content/base/src/nsDOMTokenList.cpp | 2 +- content/base/src/nsFormData.cpp | 2 +- content/canvas/src/CanvasRenderingContext2D.cpp | 4 ++-- content/canvas/src/WebGLContext.cpp | 2 +- content/canvas/src/WebGLFramebuffer.cpp | 2 +- content/canvas/src/WebGLProgram.cpp | 2 +- content/canvas/src/WebGLVertexArray.cpp | 2 +- content/html/content/src/HTMLCanvasElement.cpp | 4 ++-- content/html/content/src/HTMLOptionsCollection.cpp | 2 +- content/html/content/src/HTMLTableElement.cpp | 2 +- content/html/content/src/MediaError.cpp | 2 +- content/html/content/src/UndoManager.cpp | 2 +- content/html/content/src/ValidityState.cpp | 2 +- content/media/TextTrackCueList.cpp | 2 +- content/media/TextTrackRegion.cpp | 2 +- content/media/VideoPlaybackQuality.cpp | 2 +- content/media/webaudio/AudioListener.cpp | 2 +- content/media/webaudio/PeriodicWave.cpp | 2 +- .../media/webspeech/recognition/SpeechGrammar.cpp | 2 +- .../webspeech/recognition/SpeechGrammarList.cpp | 2 +- .../recognition/SpeechRecognitionAlternative.cpp | 2 +- .../recognition/SpeechRecognitionResult.cpp | 2 +- .../recognition/SpeechRecognitionResultList.cpp | 2 +- .../media/webspeech/synth/SpeechSynthesisVoice.cpp | 2 +- content/svg/content/src/SVGMatrix.cpp | 2 +- content/svg/content/src/SVGRect.cpp | 2 +- dom/base/BarProps.cpp | 2 +- dom/base/Crypto.cpp | 2 +- dom/base/DOMError.cpp | 2 +- dom/base/MessageChannel.cpp | 2 +- dom/base/MessagePortList.cpp | 2 +- dom/base/PerformanceEntry.cpp | 2 +- dom/base/URLSearchParams.cpp | 2 +- dom/base/nsMimeTypeArray.cpp | 10 +++++----- dom/base/nsPerformance.cpp | 12 ++++++------ dom/base/nsPluginArray.cpp | 10 +++++----- dom/base/nsWindowRoot.cpp | 10 +++++----- dom/camera/DOMCameraDetectedFace.cpp | 6 +++--- dom/camera/DOMCameraManager.cpp | 2 +- dom/events/DeviceMotionEvent.cpp | 4 ++-- dom/events/PaintRequest.cpp | 4 ++-- dom/events/Touch.cpp | 2 +- dom/events/TouchEvent.cpp | 2 +- dom/file/ArchiveReader.cpp | 10 +++++----- dom/gamepad/Gamepad.cpp | 2 +- dom/gamepad/GamepadButton.cpp | 2 +- dom/power/PowerManager.cpp | 2 +- dom/src/geolocation/nsGeoPosition.cpp | 4 ++-- dom/src/geolocation/nsGeolocation.cpp | 12 ++++++------ dom/telephony/CallsList.cpp | 6 +++--- dom/time/TimeManager.cpp | 2 +- dom/xbl/XBLChildrenElement.cpp | 2 +- layout/style/nsComputedDOMStyle.cpp | 2 +- layout/style/nsDOMCSSAttrDeclaration.cpp | 2 +- layout/style/nsDOMCSSRGBColor.cpp | 2 +- layout/style/nsDOMCSSRect.cpp | 2 +- layout/style/nsDOMCSSValueList.cpp | 2 +- 65 files changed, 107 insertions(+), 107 deletions(-) diff --git a/content/base/src/DOMImplementation.cpp b/content/base/src/DOMImplementation.cpp index e8e2bbc3b6b..ad9a2c47e86 100644 --- a/content/base/src/DOMImplementation.cpp +++ b/content/base/src/DOMImplementation.cpp @@ -23,7 +23,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMImplementation) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(DOMImplementation, mOwner) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(DOMImplementation, mOwner) NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMImplementation) NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMImplementation) diff --git a/content/base/src/DOMParser.cpp b/content/base/src/DOMParser.cpp index 65762036c45..98908733ddd 100644 --- a/content/base/src/DOMParser.cpp +++ b/content/base/src/DOMParser.cpp @@ -38,7 +38,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMParser) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(DOMParser, mOwner) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(DOMParser, mOwner) NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMParser) NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMParser) diff --git a/content/base/src/DOMPoint.cpp b/content/base/src/DOMPoint.cpp index 777be174d2c..b5cd255403b 100644 --- a/content/base/src/DOMPoint.cpp +++ b/content/base/src/DOMPoint.cpp @@ -12,7 +12,7 @@ using namespace mozilla; using namespace mozilla::dom; -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(DOMPoint, mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(DOMPoint, mParent) NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(DOMPoint, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(DOMPoint, Release) diff --git a/content/base/src/DOMQuad.cpp b/content/base/src/DOMQuad.cpp index 2cfceee703c..6d1b1b6d4ea 100644 --- a/content/base/src/DOMQuad.cpp +++ b/content/base/src/DOMQuad.cpp @@ -14,8 +14,8 @@ using namespace mozilla; using namespace mozilla::dom; using namespace mozilla::gfx; -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_6(DOMQuad, mParent, mBounds, mPoints[0], - mPoints[1], mPoints[2], mPoints[3]) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(DOMQuad, mParent, mBounds, mPoints[0], + mPoints[1], mPoints[2], mPoints[3]) NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(DOMQuad, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(DOMQuad, Release) diff --git a/content/base/src/DOMRect.cpp b/content/base/src/DOMRect.cpp index b26414b6e29..7541fbb75db 100644 --- a/content/base/src/DOMRect.cpp +++ b/content/base/src/DOMRect.cpp @@ -12,7 +12,7 @@ using namespace mozilla; using namespace mozilla::dom; -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(DOMRectReadOnly, mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(DOMRectReadOnly, mParent) NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMRectReadOnly) NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMRectReadOnly) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMRectReadOnly) @@ -72,7 +72,7 @@ DOMRect::Constructor(const GlobalObject& aGlobal, double aX, double aY, // ----------------------------------------------------------------------------- -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(DOMRectList, mParent, mArray) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(DOMRectList, mParent, mArray) NS_INTERFACE_TABLE_HEAD(DOMRectList) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY diff --git a/content/base/src/nsDOMCaretPosition.cpp b/content/base/src/nsDOMCaretPosition.cpp index 8ea6b0007ea..24bbac83746 100644 --- a/content/base/src/nsDOMCaretPosition.cpp +++ b/content/base/src/nsDOMCaretPosition.cpp @@ -62,8 +62,8 @@ nsDOMCaretPosition::WrapObject(JSContext *aCx) return mozilla::dom::CaretPositionBinding::Wrap(aCx, this); } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(nsDOMCaretPosition, - mOffsetNode, mAnonymousContentNode) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsDOMCaretPosition, + mOffsetNode, mAnonymousContentNode) NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMCaretPosition) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMCaretPosition) diff --git a/content/base/src/nsDOMMutationObserver.cpp b/content/base/src/nsDOMMutationObserver.cpp index 50d89554f7d..53443aba146 100644 --- a/content/base/src/nsDOMMutationObserver.cpp +++ b/content/base/src/nsDOMMutationObserver.cpp @@ -52,11 +52,11 @@ NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMMutationRecord) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMMutationRecord) -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_7(nsDOMMutationRecord, - mTarget, - mPreviousSibling, mNextSibling, - mAddedNodes, mRemovedNodes, - mNext, mOwner) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsDOMMutationRecord, + mTarget, + mPreviousSibling, mNextSibling, + mAddedNodes, mRemovedNodes, + mNext, mOwner) // Observer diff --git a/content/base/src/nsDOMSerializer.cpp b/content/base/src/nsDOMSerializer.cpp index ce8825215de..8998a8347a7 100644 --- a/content/base/src/nsDOMSerializer.cpp +++ b/content/base/src/nsDOMSerializer.cpp @@ -32,7 +32,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMSerializer) NS_INTERFACE_MAP_ENTRY(nsIDOMSerializer) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsDOMSerializer, mOwner) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsDOMSerializer, mOwner) NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMSerializer) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMSerializer) diff --git a/content/base/src/nsDOMTokenList.cpp b/content/base/src/nsDOMTokenList.cpp index c242a83486e..80254fe0947 100644 --- a/content/base/src/nsDOMTokenList.cpp +++ b/content/base/src/nsDOMTokenList.cpp @@ -29,7 +29,7 @@ nsDOMTokenList::nsDOMTokenList(Element* aElement, nsIAtom* aAttrAtom) nsDOMTokenList::~nsDOMTokenList() { } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsDOMTokenList, mElement) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsDOMTokenList, mElement) NS_INTERFACE_MAP_BEGIN(nsDOMTokenList) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY diff --git a/content/base/src/nsFormData.cpp b/content/base/src/nsFormData.cpp index 41fa252f8ac..c5bd9edba32 100644 --- a/content/base/src/nsFormData.cpp +++ b/content/base/src/nsFormData.cpp @@ -22,7 +22,7 @@ nsFormData::nsFormData(nsISupports* aOwner) // ------------------------------------------------------------------------- // nsISupports -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsFormData, mOwner) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsFormData, mOwner) NS_IMPL_CYCLE_COLLECTING_ADDREF(nsFormData) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsFormData) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsFormData) diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/content/canvas/src/CanvasRenderingContext2D.cpp index d4fe0636263..ac466e72e54 100755 --- a/content/canvas/src/CanvasRenderingContext2D.cpp +++ b/content/canvas/src/CanvasRenderingContext2D.cpp @@ -415,12 +415,12 @@ CanvasGradient::AddColorStop(float offset, const nsAString& colorstr, ErrorResul NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(CanvasGradient, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(CanvasGradient, Release) -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(CanvasGradient, mContext) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(CanvasGradient, mContext) NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(CanvasPattern, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(CanvasPattern, Release) -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(CanvasPattern, mContext) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(CanvasPattern, mContext) class CanvasRenderingContext2DUserData : public LayerUserData { public: diff --git a/content/canvas/src/WebGLContext.cpp b/content/canvas/src/WebGLContext.cpp index 459d4c0ffa4..4bf20859c7c 100644 --- a/content/canvas/src/WebGLContext.cpp +++ b/content/canvas/src/WebGLContext.cpp @@ -1396,7 +1396,7 @@ WebGLContext::GetSurfaceSnapshot(bool* aPremultAlpha) NS_IMPL_CYCLE_COLLECTING_ADDREF(WebGLContext) NS_IMPL_CYCLE_COLLECTING_RELEASE(WebGLContext) -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_13(WebGLContext, +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(WebGLContext, mCanvasElement, mExtensions, mBound2DTextures, diff --git a/content/canvas/src/WebGLFramebuffer.cpp b/content/canvas/src/WebGLFramebuffer.cpp index 396028f5fd6..ecec650c30a 100644 --- a/content/canvas/src/WebGLFramebuffer.cpp +++ b/content/canvas/src/WebGLFramebuffer.cpp @@ -940,7 +940,7 @@ ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& aCallback, aName, aFlags); } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_4(WebGLFramebuffer, +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(WebGLFramebuffer, mColorAttachments, mDepthAttachment, mStencilAttachment, diff --git a/content/canvas/src/WebGLProgram.cpp b/content/canvas/src/WebGLProgram.cpp index 6457f37a88e..b44b1676c47 100644 --- a/content/canvas/src/WebGLProgram.cpp +++ b/content/canvas/src/WebGLProgram.cpp @@ -237,7 +237,7 @@ WebGLProgram::GetUniformInfoForMappedIdentifier(const nsACString& name) { return info; } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(WebGLProgram, mAttachedShaders) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(WebGLProgram, mAttachedShaders) NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(WebGLProgram, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(WebGLProgram, Release) diff --git a/content/canvas/src/WebGLVertexArray.cpp b/content/canvas/src/WebGLVertexArray.cpp index 0081b8b8d5f..a9e27432da5 100644 --- a/content/canvas/src/WebGLVertexArray.cpp +++ b/content/canvas/src/WebGLVertexArray.cpp @@ -56,7 +56,7 @@ bool WebGLVertexArray::EnsureAttrib(GLuint index, const char *info) return true; } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(WebGLVertexArray, +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(WebGLVertexArray, mAttribs, mBoundElementArrayBuffer) diff --git a/content/html/content/src/HTMLCanvasElement.cpp b/content/html/content/src/HTMLCanvasElement.cpp index c89416787e3..289837060e5 100644 --- a/content/html/content/src/HTMLCanvasElement.cpp +++ b/content/html/content/src/HTMLCanvasElement.cpp @@ -52,8 +52,8 @@ HTMLImageOrCanvasOrVideoElement; namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_3(HTMLCanvasPrintState, mCanvas, - mContext, mCallback) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(HTMLCanvasPrintState, mCanvas, + mContext, mCallback) NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(HTMLCanvasPrintState, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(HTMLCanvasPrintState, Release) diff --git a/content/html/content/src/HTMLOptionsCollection.cpp b/content/html/content/src/HTMLOptionsCollection.cpp index 66d1468aa30..15292cc41ee 100644 --- a/content/html/content/src/HTMLOptionsCollection.cpp +++ b/content/html/content/src/HTMLOptionsCollection.cpp @@ -89,7 +89,7 @@ HTMLOptionsCollection::GetOptionIndex(Element* aOption, } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(HTMLOptionsCollection, mElements) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(HTMLOptionsCollection, mElements) // nsISupports diff --git a/content/html/content/src/HTMLTableElement.cpp b/content/html/content/src/HTMLTableElement.cpp index f9804145be1..5a789e98a19 100644 --- a/content/html/content/src/HTMLTableElement.cpp +++ b/content/html/content/src/HTMLTableElement.cpp @@ -89,7 +89,7 @@ TableRowsCollection::WrapObject(JSContext* aCx) return HTMLCollectionBinding::Wrap(aCx, this); } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(TableRowsCollection, mOrphanRows) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(TableRowsCollection, mOrphanRows) NS_IMPL_CYCLE_COLLECTING_ADDREF(TableRowsCollection) NS_IMPL_CYCLE_COLLECTING_RELEASE(TableRowsCollection) diff --git a/content/html/content/src/MediaError.cpp b/content/html/content/src/MediaError.cpp index 16c559a0bf8..6b82ace4bd1 100644 --- a/content/html/content/src/MediaError.cpp +++ b/content/html/content/src/MediaError.cpp @@ -11,7 +11,7 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(MediaError, mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(MediaError, mParent) NS_IMPL_CYCLE_COLLECTING_ADDREF(MediaError) NS_IMPL_CYCLE_COLLECTING_RELEASE(MediaError) diff --git a/content/html/content/src/UndoManager.cpp b/content/html/content/src/UndoManager.cpp index b28d5acf80a..8ca1f4af52b 100644 --- a/content/html/content/src/UndoManager.cpp +++ b/content/html/content/src/UndoManager.cpp @@ -820,7 +820,7 @@ protected: // UndoManager ///////////////////////////////////////////////// -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(UndoManager, mTxnManager, mHostNode) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(UndoManager, mTxnManager, mHostNode) NS_IMPL_CYCLE_COLLECTING_ADDREF(UndoManager) NS_IMPL_CYCLE_COLLECTING_RELEASE(UndoManager) diff --git a/content/html/content/src/ValidityState.cpp b/content/html/content/src/ValidityState.cpp index 2c85208aab0..ed9304d1786 100644 --- a/content/html/content/src/ValidityState.cpp +++ b/content/html/content/src/ValidityState.cpp @@ -11,7 +11,7 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(ValidityState, mConstraintValidation) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(ValidityState, mConstraintValidation) NS_IMPL_CYCLE_COLLECTING_ADDREF(ValidityState) NS_IMPL_CYCLE_COLLECTING_RELEASE(ValidityState) diff --git a/content/media/TextTrackCueList.cpp b/content/media/TextTrackCueList.cpp index 3fe293a9de1..3fc5eac5698 100644 --- a/content/media/TextTrackCueList.cpp +++ b/content/media/TextTrackCueList.cpp @@ -24,7 +24,7 @@ public: } }; -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(TextTrackCueList, mParent, mList) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(TextTrackCueList, mParent, mList) NS_IMPL_CYCLE_COLLECTING_ADDREF(TextTrackCueList) NS_IMPL_CYCLE_COLLECTING_RELEASE(TextTrackCueList) diff --git a/content/media/TextTrackRegion.cpp b/content/media/TextTrackRegion.cpp index 7a40ecf0009..6b3b4487600 100644 --- a/content/media/TextTrackRegion.cpp +++ b/content/media/TextTrackRegion.cpp @@ -10,7 +10,7 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(TextTrackRegion, mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(TextTrackRegion, mParent) NS_IMPL_CYCLE_COLLECTING_ADDREF(TextTrackRegion) NS_IMPL_CYCLE_COLLECTING_RELEASE(TextTrackRegion) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TextTrackRegion) diff --git a/content/media/VideoPlaybackQuality.cpp b/content/media/VideoPlaybackQuality.cpp index 2547e6b0ed4..1601ec18832 100644 --- a/content/media/VideoPlaybackQuality.cpp +++ b/content/media/VideoPlaybackQuality.cpp @@ -43,7 +43,7 @@ VideoPlaybackQuality::WrapObject(JSContext *aCx) NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(VideoPlaybackQuality, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(VideoPlaybackQuality, Release) -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(VideoPlaybackQuality, mElement) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(VideoPlaybackQuality, mElement) } // namespace dom } // namespace mozilla diff --git a/content/media/webaudio/AudioListener.cpp b/content/media/webaudio/AudioListener.cpp index d9e02a34ced..a297f61b4ac 100644 --- a/content/media/webaudio/AudioListener.cpp +++ b/content/media/webaudio/AudioListener.cpp @@ -11,7 +11,7 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(AudioListener, mContext) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(AudioListener, mContext) NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(AudioListener, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(AudioListener, Release) diff --git a/content/media/webaudio/PeriodicWave.cpp b/content/media/webaudio/PeriodicWave.cpp index 045d53a2f65..abbeda395a0 100644 --- a/content/media/webaudio/PeriodicWave.cpp +++ b/content/media/webaudio/PeriodicWave.cpp @@ -11,7 +11,7 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(PeriodicWave, mContext) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(PeriodicWave, mContext) NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(PeriodicWave, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(PeriodicWave, Release) diff --git a/content/media/webspeech/recognition/SpeechGrammar.cpp b/content/media/webspeech/recognition/SpeechGrammar.cpp index 69a42a1fedc..bf6fca53888 100644 --- a/content/media/webspeech/recognition/SpeechGrammar.cpp +++ b/content/media/webspeech/recognition/SpeechGrammar.cpp @@ -12,7 +12,7 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(SpeechGrammar, mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(SpeechGrammar, mParent) NS_IMPL_CYCLE_COLLECTING_ADDREF(SpeechGrammar) NS_IMPL_CYCLE_COLLECTING_RELEASE(SpeechGrammar) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SpeechGrammar) diff --git a/content/media/webspeech/recognition/SpeechGrammarList.cpp b/content/media/webspeech/recognition/SpeechGrammarList.cpp index e2d9b74ebbd..6d89846daaa 100644 --- a/content/media/webspeech/recognition/SpeechGrammarList.cpp +++ b/content/media/webspeech/recognition/SpeechGrammarList.cpp @@ -12,7 +12,7 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(SpeechGrammarList, mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(SpeechGrammarList, mParent) NS_IMPL_CYCLE_COLLECTING_ADDREF(SpeechGrammarList) NS_IMPL_CYCLE_COLLECTING_RELEASE(SpeechGrammarList) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SpeechGrammarList) diff --git a/content/media/webspeech/recognition/SpeechRecognitionAlternative.cpp b/content/media/webspeech/recognition/SpeechRecognitionAlternative.cpp index 0f4345de307..55c64a53398 100644 --- a/content/media/webspeech/recognition/SpeechRecognitionAlternative.cpp +++ b/content/media/webspeech/recognition/SpeechRecognitionAlternative.cpp @@ -13,7 +13,7 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(SpeechRecognitionAlternative, mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(SpeechRecognitionAlternative, mParent) NS_IMPL_CYCLE_COLLECTING_ADDREF(SpeechRecognitionAlternative) NS_IMPL_CYCLE_COLLECTING_RELEASE(SpeechRecognitionAlternative) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SpeechRecognitionAlternative) diff --git a/content/media/webspeech/recognition/SpeechRecognitionResult.cpp b/content/media/webspeech/recognition/SpeechRecognitionResult.cpp index d3a70a11954..7bcc2328a4f 100644 --- a/content/media/webspeech/recognition/SpeechRecognitionResult.cpp +++ b/content/media/webspeech/recognition/SpeechRecognitionResult.cpp @@ -12,7 +12,7 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(SpeechRecognitionResult, mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(SpeechRecognitionResult, mParent) NS_IMPL_CYCLE_COLLECTING_ADDREF(SpeechRecognitionResult) NS_IMPL_CYCLE_COLLECTING_RELEASE(SpeechRecognitionResult) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SpeechRecognitionResult) diff --git a/content/media/webspeech/recognition/SpeechRecognitionResultList.cpp b/content/media/webspeech/recognition/SpeechRecognitionResultList.cpp index 8e392804827..4a72ddff765 100644 --- a/content/media/webspeech/recognition/SpeechRecognitionResultList.cpp +++ b/content/media/webspeech/recognition/SpeechRecognitionResultList.cpp @@ -13,7 +13,7 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(SpeechRecognitionResultList, mParent, mItems) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(SpeechRecognitionResultList, mParent, mItems) NS_IMPL_CYCLE_COLLECTING_ADDREF(SpeechRecognitionResultList) NS_IMPL_CYCLE_COLLECTING_RELEASE(SpeechRecognitionResultList) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SpeechRecognitionResultList) diff --git a/content/media/webspeech/synth/SpeechSynthesisVoice.cpp b/content/media/webspeech/synth/SpeechSynthesisVoice.cpp index 16bd05a6b5a..6b2437eda9c 100644 --- a/content/media/webspeech/synth/SpeechSynthesisVoice.cpp +++ b/content/media/webspeech/synth/SpeechSynthesisVoice.cpp @@ -11,7 +11,7 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(SpeechSynthesisVoice, mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(SpeechSynthesisVoice, mParent) NS_IMPL_CYCLE_COLLECTING_ADDREF(SpeechSynthesisVoice) NS_IMPL_CYCLE_COLLECTING_RELEASE(SpeechSynthesisVoice) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SpeechSynthesisVoice) diff --git a/content/svg/content/src/SVGMatrix.cpp b/content/svg/content/src/SVGMatrix.cpp index d44b6dc9843..4a3c6337cbe 100644 --- a/content/svg/content/src/SVGMatrix.cpp +++ b/content/svg/content/src/SVGMatrix.cpp @@ -14,7 +14,7 @@ const double radPerDegree = 2.0 * M_PI / 360.0; namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(SVGMatrix, mTransform) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(SVGMatrix, mTransform) NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(SVGMatrix, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(SVGMatrix, Release) diff --git a/content/svg/content/src/SVGRect.cpp b/content/svg/content/src/SVGRect.cpp index 0f0d579137e..31977b4638d 100644 --- a/content/svg/content/src/SVGRect.cpp +++ b/content/svg/content/src/SVGRect.cpp @@ -22,7 +22,7 @@ SVGRect::SVGRect(nsIContent* aParent, float x, float y, float w, float h) //---------------------------------------------------------------------- // nsISupports methods: -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(SVGRect, mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(SVGRect, mParent) NS_IMPL_CYCLE_COLLECTING_ADDREF(SVGRect) NS_IMPL_CYCLE_COLLECTING_RELEASE(SVGRect) diff --git a/dom/base/BarProps.cpp b/dom/base/BarProps.cpp index 229976ad8e4..bcb893bdff6 100644 --- a/dom/base/BarProps.cpp +++ b/dom/base/BarProps.cpp @@ -40,7 +40,7 @@ BarProp::WrapObject(JSContext* aCx) return BarPropBinding::Wrap(aCx, this); } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(BarProp, mDOMWindow) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(BarProp, mDOMWindow) NS_IMPL_CYCLE_COLLECTING_ADDREF(BarProp) NS_IMPL_CYCLE_COLLECTING_RELEASE(BarProp) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(BarProp) diff --git a/dom/base/Crypto.cpp b/dom/base/Crypto.cpp index 53524c32f83..549cf7b554b 100644 --- a/dom/base/Crypto.cpp +++ b/dom/base/Crypto.cpp @@ -29,7 +29,7 @@ NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(Crypto) NS_IMPL_CYCLE_COLLECTING_RELEASE(Crypto) -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(Crypto, mWindow) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(Crypto, mWindow) Crypto::Crypto() { diff --git a/dom/base/DOMError.cpp b/dom/base/DOMError.cpp index 40d40a554c6..e214ab6a5ec 100644 --- a/dom/base/DOMError.cpp +++ b/dom/base/DOMError.cpp @@ -12,7 +12,7 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(DOMError, mWindow) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(DOMError, mWindow) NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMError) NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMError) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMError) diff --git a/dom/base/MessageChannel.cpp b/dom/base/MessageChannel.cpp index a959645222c..a8763b7faa5 100644 --- a/dom/base/MessageChannel.cpp +++ b/dom/base/MessageChannel.cpp @@ -13,7 +13,7 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_3(MessageChannel, mWindow, mPort1, mPort2) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(MessageChannel, mWindow, mPort1, mPort2) NS_IMPL_CYCLE_COLLECTING_ADDREF(MessageChannel) NS_IMPL_CYCLE_COLLECTING_RELEASE(MessageChannel) diff --git a/dom/base/MessagePortList.cpp b/dom/base/MessagePortList.cpp index 9b45f282b67..dc7b3c038f3 100644 --- a/dom/base/MessagePortList.cpp +++ b/dom/base/MessagePortList.cpp @@ -11,7 +11,7 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(MessagePortList, mOwner, mPorts) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(MessagePortList, mOwner, mPorts) NS_IMPL_CYCLE_COLLECTING_ADDREF(MessagePortList) NS_IMPL_CYCLE_COLLECTING_RELEASE(MessagePortList) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MessagePortList) diff --git a/dom/base/PerformanceEntry.cpp b/dom/base/PerformanceEntry.cpp index 6c3688da552..9607e9cee01 100644 --- a/dom/base/PerformanceEntry.cpp +++ b/dom/base/PerformanceEntry.cpp @@ -9,7 +9,7 @@ using namespace mozilla::dom; -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(PerformanceEntry, mPerformance) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(PerformanceEntry, mPerformance) NS_IMPL_CYCLE_COLLECTING_ADDREF(PerformanceEntry) NS_IMPL_CYCLE_COLLECTING_RELEASE(PerformanceEntry) diff --git a/dom/base/URLSearchParams.cpp b/dom/base/URLSearchParams.cpp index 50e710a77ae..9707476a780 100644 --- a/dom/base/URLSearchParams.cpp +++ b/dom/base/URLSearchParams.cpp @@ -9,7 +9,7 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(URLSearchParams, mObservers) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(URLSearchParams, mObservers) NS_IMPL_CYCLE_COLLECTING_ADDREF(URLSearchParams) NS_IMPL_CYCLE_COLLECTING_RELEASE(URLSearchParams) diff --git a/dom/base/nsMimeTypeArray.cpp b/dom/base/nsMimeTypeArray.cpp index d04a1785d88..faef9a0135e 100644 --- a/dom/base/nsMimeTypeArray.cpp +++ b/dom/base/nsMimeTypeArray.cpp @@ -25,10 +25,10 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsMimeTypeArray) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_3(nsMimeTypeArray, - mWindow, - mMimeTypes, - mHiddenMimeTypes) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsMimeTypeArray, + mWindow, + mMimeTypes, + mHiddenMimeTypes) nsMimeTypeArray::nsMimeTypeArray(nsPIDOMWindow* aWindow) : mWindow(aWindow) @@ -224,7 +224,7 @@ nsMimeTypeArray::EnsurePluginMimeTypes() NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(nsMimeType, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(nsMimeType, Release) -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(nsMimeType, mWindow, mPluginElement) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsMimeType, mWindow, mPluginElement) nsMimeType::nsMimeType(nsPIDOMWindow* aWindow, nsPluginElement* aPluginElement, uint32_t aPluginTagMimeIndex, const nsAString& aType) diff --git a/dom/base/nsPerformance.cpp b/dom/base/nsPerformance.cpp index d8b0925c710..8edcff479f8 100644 --- a/dom/base/nsPerformance.cpp +++ b/dom/base/nsPerformance.cpp @@ -22,7 +22,7 @@ using namespace mozilla; -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsPerformanceTiming, mPerformance) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsPerformanceTiming, mPerformance) NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(nsPerformanceTiming, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(nsPerformanceTiming, Release) @@ -337,7 +337,7 @@ nsPerformanceTiming::WrapObject(JSContext *cx) } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsPerformanceNavigation, mPerformance) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsPerformanceNavigation, mPerformance) NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(nsPerformanceNavigation, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(nsPerformanceNavigation, Release) @@ -360,10 +360,10 @@ nsPerformanceNavigation::WrapObject(JSContext *cx) } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_5(nsPerformance, - mWindow, mTiming, - mNavigation, mEntries, - mParentPerformance) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsPerformance, + mWindow, mTiming, + mNavigation, mEntries, + mParentPerformance) NS_IMPL_CYCLE_COLLECTING_ADDREF(nsPerformance) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsPerformance) diff --git a/dom/base/nsPluginArray.cpp b/dom/base/nsPluginArray.cpp index 5204fb49ce9..03d5ec391c7 100644 --- a/dom/base/nsPluginArray.cpp +++ b/dom/base/nsPluginArray.cpp @@ -66,10 +66,10 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsPluginArray) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_3(nsPluginArray, - mWindow, - mPlugins, - mHiddenPlugins) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsPluginArray, + mWindow, + mPlugins, + mHiddenPlugins) static void GetPluginMimeTypes(const nsTArray >& aPlugins, @@ -356,7 +356,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsPluginElement) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(nsPluginElement, mWindow, mMimeTypes) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsPluginElement, mWindow, mMimeTypes) nsPluginElement::nsPluginElement(nsPIDOMWindow* aWindow, nsPluginTag* aPluginTag) diff --git a/dom/base/nsWindowRoot.cpp b/dom/base/nsWindowRoot.cpp index 1130bf66419..65c53951d06 100644 --- a/dom/base/nsWindowRoot.cpp +++ b/dom/base/nsWindowRoot.cpp @@ -42,11 +42,11 @@ nsWindowRoot::~nsWindowRoot() } } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_4(nsWindowRoot, - mWindow, - mListenerManager, - mPopupNode, - mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsWindowRoot, + mWindow, + mListenerManager, + mPopupNode, + mParent) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsWindowRoot) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY diff --git a/dom/camera/DOMCameraDetectedFace.cpp b/dom/camera/DOMCameraDetectedFace.cpp index 86bc7c6f38b..4187995d1c6 100644 --- a/dom/camera/DOMCameraDetectedFace.cpp +++ b/dom/camera/DOMCameraDetectedFace.cpp @@ -8,7 +8,7 @@ using namespace mozilla; using namespace mozilla::dom; -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(DOMCameraPoint, mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(DOMCameraPoint, mParent) NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMCameraPoint) NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMCameraPoint) @@ -17,8 +17,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMCameraPoint) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_5(DOMCameraDetectedFace, mParent, - mBounds, mLeftEye, mRightEye, mMouth) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(DOMCameraDetectedFace, mParent, + mBounds, mLeftEye, mRightEye, mMouth) NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMCameraDetectedFace) NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMCameraDetectedFace) diff --git a/dom/camera/DOMCameraManager.cpp b/dom/camera/DOMCameraManager.cpp index 8a7614ad5d5..d7fe40d1a61 100644 --- a/dom/camera/DOMCameraManager.cpp +++ b/dom/camera/DOMCameraManager.cpp @@ -23,7 +23,7 @@ using namespace mozilla; using namespace mozilla::dom; -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsDOMCameraManager, mWindow) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsDOMCameraManager, mWindow) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMCameraManager) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIObserver) diff --git a/dom/events/DeviceMotionEvent.cpp b/dom/events/DeviceMotionEvent.cpp index 10638c287a9..5ec72db4353 100644 --- a/dom/events/DeviceMotionEvent.cpp +++ b/dom/events/DeviceMotionEvent.cpp @@ -95,7 +95,7 @@ DeviceMotionEvent::Constructor(const GlobalObject& aGlobal, * DeviceAcceleration *****************************************************************************/ -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(DeviceAcceleration, mOwner) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(DeviceAcceleration, mOwner) NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(DeviceAcceleration, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(DeviceAcceleration, Release) @@ -120,7 +120,7 @@ DeviceAcceleration::~DeviceAcceleration() * DeviceRotationRate *****************************************************************************/ -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(DeviceRotationRate, mOwner) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(DeviceRotationRate, mOwner) NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(DeviceRotationRate, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(DeviceRotationRate, Release) diff --git a/dom/events/PaintRequest.cpp b/dom/events/PaintRequest.cpp index 02b9e6eb60c..d162e27f94c 100644 --- a/dom/events/PaintRequest.cpp +++ b/dom/events/PaintRequest.cpp @@ -16,7 +16,7 @@ namespace dom { * mozilla::dom::PaintRequest *****************************************************************************/ -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(PaintRequest, mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(PaintRequest, mParent) NS_INTERFACE_TABLE_HEAD(PaintRequest) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY @@ -60,7 +60,7 @@ PaintRequest::GetXPCOMReason(nsAString& aResult) * mozilla::dom::PaintRequestList *****************************************************************************/ -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(PaintRequestList, mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(PaintRequestList, mParent) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PaintRequestList) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY diff --git a/dom/events/Touch.cpp b/dom/events/Touch.cpp index af5d6cea2d7..dd2987f624f 100644 --- a/dom/events/Touch.cpp +++ b/dom/events/Touch.cpp @@ -79,7 +79,7 @@ Touch::PrefEnabled(JSContext* aCx, JSObject* aGlobal) return TouchEvent::PrefEnabled(aCx, aGlobal); } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(Touch, mTarget) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(Touch, mTarget) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Touch) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY diff --git a/dom/events/TouchEvent.cpp b/dom/events/TouchEvent.cpp index d8626905f62..8fd069bbe69 100644 --- a/dom/events/TouchEvent.cpp +++ b/dom/events/TouchEvent.cpp @@ -30,7 +30,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TouchList) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(TouchList, mParent, mPoints) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(TouchList, mParent, mPoints) NS_IMPL_CYCLE_COLLECTING_ADDREF(TouchList) NS_IMPL_CYCLE_COLLECTING_RELEASE(TouchList) diff --git a/dom/file/ArchiveReader.cpp b/dom/file/ArchiveReader.cpp index 55d6fe2936a..118971e17cb 100644 --- a/dom/file/ArchiveReader.cpp +++ b/dom/file/ArchiveReader.cpp @@ -202,11 +202,11 @@ ArchiveReader::GenerateArchiveRequest() return ArchiveRequest::Create(mWindow, this); } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_4(ArchiveReader, - mBlob, - mWindow, - mData.fileList, - mRequests) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(ArchiveReader, + mBlob, + mWindow, + mData.fileList, + mRequests) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ArchiveReader) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY diff --git a/dom/gamepad/Gamepad.cpp b/dom/gamepad/Gamepad.cpp index 5e2d74c2d31..f2cff65d2ea 100644 --- a/dom/gamepad/Gamepad.cpp +++ b/dom/gamepad/Gamepad.cpp @@ -19,7 +19,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Gamepad) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(Gamepad, mParent, mButtons) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(Gamepad, mParent, mButtons) Gamepad::Gamepad(nsISupports* aParent, const nsAString& aID, uint32_t aIndex, diff --git a/dom/gamepad/GamepadButton.cpp b/dom/gamepad/GamepadButton.cpp index d67821f433e..a46eecd4573 100644 --- a/dom/gamepad/GamepadButton.cpp +++ b/dom/gamepad/GamepadButton.cpp @@ -16,7 +16,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(GamepadButton) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(GamepadButton, mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(GamepadButton, mParent) /* virtual */ JSObject* GamepadButton::WrapObject(JSContext* aCx) diff --git a/dom/power/PowerManager.cpp b/dom/power/PowerManager.cpp index 9f08b26c48f..dbea7f84345 100644 --- a/dom/power/PowerManager.cpp +++ b/dom/power/PowerManager.cpp @@ -27,7 +27,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PowerManager) NS_INTERFACE_MAP_ENTRY(nsIDOMMozWakeLockListener) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(PowerManager, mListeners, mWindow) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(PowerManager, mListeners, mWindow) NS_IMPL_CYCLE_COLLECTING_ADDREF(PowerManager) NS_IMPL_CYCLE_COLLECTING_RELEASE(PowerManager) diff --git a/dom/src/geolocation/nsGeoPosition.cpp b/dom/src/geolocation/nsGeoPosition.cpp index d0fd37a658c..ec8bf70515f 100644 --- a/dom/src/geolocation/nsGeoPosition.cpp +++ b/dom/src/geolocation/nsGeoPosition.cpp @@ -146,7 +146,7 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(Position, mParent, mCoordinates) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(Position, mParent, mCoordinates) NS_IMPL_CYCLE_COLLECTING_ADDREF(Position) NS_IMPL_CYCLE_COLLECTING_RELEASE(Position) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Position) @@ -200,7 +200,7 @@ Position::Timestamp() const return rv; } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(Coordinates, mPosition) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(Coordinates, mPosition) NS_IMPL_CYCLE_COLLECTING_ADDREF(Coordinates) NS_IMPL_CYCLE_COLLECTING_RELEASE(Coordinates) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Coordinates) diff --git a/dom/src/geolocation/nsGeolocation.cpp b/dom/src/geolocation/nsGeolocation.cpp index 6418d9c8aed..194732262fc 100644 --- a/dom/src/geolocation/nsGeolocation.cpp +++ b/dom/src/geolocation/nsGeolocation.cpp @@ -240,7 +240,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PositionError) NS_INTERFACE_MAP_ENTRY(nsIDOMGeoPositionError) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(PositionError, mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(PositionError, mParent) NS_IMPL_CYCLE_COLLECTING_ADDREF(PositionError) NS_IMPL_CYCLE_COLLECTING_RELEASE(PositionError) @@ -1032,11 +1032,11 @@ NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(Geolocation) NS_IMPL_CYCLE_COLLECTING_RELEASE(Geolocation) -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_4(Geolocation, - mCachedPosition, - mPendingCallbacks, - mWatchingCallbacks, - mPendingRequests) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(Geolocation, + mCachedPosition, + mPendingCallbacks, + mWatchingCallbacks, + mPendingRequests) Geolocation::Geolocation() : mLastWatchId(0) diff --git a/dom/telephony/CallsList.cpp b/dom/telephony/CallsList.cpp index 67099fd449e..68607d9f63a 100644 --- a/dom/telephony/CallsList.cpp +++ b/dom/telephony/CallsList.cpp @@ -13,9 +13,9 @@ using namespace mozilla::dom; -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(CallsList, - mTelephony, - mGroup) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(CallsList, + mTelephony, + mGroup) NS_IMPL_CYCLE_COLLECTING_ADDREF(CallsList) NS_IMPL_CYCLE_COLLECTING_RELEASE(CallsList) diff --git a/dom/time/TimeManager.cpp b/dom/time/TimeManager.cpp index ff71659e13f..b9123bdfc42 100644 --- a/dom/time/TimeManager.cpp +++ b/dom/time/TimeManager.cpp @@ -21,7 +21,7 @@ NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(TimeManager) NS_IMPL_CYCLE_COLLECTING_RELEASE(TimeManager) -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(TimeManager, mWindow) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(TimeManager, mWindow) JSObject* TimeManager::WrapObject(JSContext* aCx) diff --git a/dom/xbl/XBLChildrenElement.cpp b/dom/xbl/XBLChildrenElement.cpp index c1089135a12..d6caab73e0e 100644 --- a/dom/xbl/XBLChildrenElement.cpp +++ b/dom/xbl/XBLChildrenElement.cpp @@ -75,7 +75,7 @@ XBLChildrenElement::ParseAttribute(int32_t aNamespaceID, using namespace mozilla::dom; -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsAnonymousContentList, mParent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsAnonymousContentList, mParent) NS_IMPL_CYCLE_COLLECTING_ADDREF(nsAnonymousContentList) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsAnonymousContentList) diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp index 1f6993492fc..8b9afcefb36 100644 --- a/layout/style/nsComputedDOMStyle.cpp +++ b/layout/style/nsComputedDOMStyle.cpp @@ -289,7 +289,7 @@ nsComputedDOMStyle::Shutdown() } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsComputedDOMStyle, mContent) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsComputedDOMStyle, mContent) NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_BEGIN(nsComputedDOMStyle) return tmp->IsBlack(); diff --git a/layout/style/nsDOMCSSAttrDeclaration.cpp b/layout/style/nsDOMCSSAttrDeclaration.cpp index 400aea10a4e..f193087a2a0 100644 --- a/layout/style/nsDOMCSSAttrDeclaration.cpp +++ b/layout/style/nsDOMCSSAttrDeclaration.cpp @@ -35,7 +35,7 @@ nsDOMCSSAttributeDeclaration::~nsDOMCSSAttributeDeclaration() MOZ_COUNT_DTOR(nsDOMCSSAttributeDeclaration); } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsDOMCSSAttributeDeclaration, mElement) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsDOMCSSAttributeDeclaration, mElement) // mElement holds a strong ref to us, so if it's going to be // skipped, the attribute declaration can't be part of a garbage diff --git a/layout/style/nsDOMCSSRGBColor.cpp b/layout/style/nsDOMCSSRGBColor.cpp index 5b4c3efde1e..d683acb1f99 100644 --- a/layout/style/nsDOMCSSRGBColor.cpp +++ b/layout/style/nsDOMCSSRGBColor.cpp @@ -26,7 +26,7 @@ nsDOMCSSRGBColor::~nsDOMCSSRGBColor(void) { } -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_4(nsDOMCSSRGBColor, mAlpha, mBlue, mGreen, mRed) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsDOMCSSRGBColor, mAlpha, mBlue, mGreen, mRed) NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(nsDOMCSSRGBColor, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(nsDOMCSSRGBColor, Release) diff --git a/layout/style/nsDOMCSSRect.cpp b/layout/style/nsDOMCSSRect.cpp index dfc73eda81f..f80274249ea 100644 --- a/layout/style/nsDOMCSSRect.cpp +++ b/layout/style/nsDOMCSSRect.cpp @@ -33,7 +33,7 @@ NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMCSSRect) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMCSSRect) -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_4(nsDOMCSSRect, mTop, mBottom, mLeft, mRight) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsDOMCSSRect, mTop, mBottom, mLeft, mRight) JSObject* nsDOMCSSRect::WrapObject(JSContext* cx) diff --git a/layout/style/nsDOMCSSValueList.cpp b/layout/style/nsDOMCSSValueList.cpp index abb8db6f88f..cd8f3ed9910 100644 --- a/layout/style/nsDOMCSSValueList.cpp +++ b/layout/style/nsDOMCSSValueList.cpp @@ -31,7 +31,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMCSSValueList) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, CSSValue) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsDOMCSSValueList, mCSSValues) +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsDOMCSSValueList, mCSSValues) JSObject* nsDOMCSSValueList::WrapObject(JSContext *cx)