From afdf1551f1162eb2243cb33dfbe2d475910b0a28 Mon Sep 17 00:00:00 2001 From: Peter Van der Beken Date: Sun, 6 Mar 2011 12:11:31 +0100 Subject: [PATCH] Fix for bug 584048 (Clean up cycle collection code) - remove NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS/NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS. r=bent. --- accessible/src/base/nsAccessNode.cpp | 5 ++--- content/base/src/nsDOMAttribute.cpp | 6 +++--- content/base/src/nsDocument.cpp | 7 +++---- content/base/src/nsFrameLoader.cpp | 4 ++-- content/base/src/nsFrameMessageManager.cpp | 6 ++---- content/base/src/nsGenericDOMDataNode.cpp | 6 +++--- content/base/src/nsGenericElement.cpp | 15 ++++++-------- content/canvas/src/WebGLContext.cpp | 4 ++-- .../canvas/src/nsCanvasRenderingContext2D.cpp | 4 ++-- content/events/src/nsDOMEventTargetHelper.cpp | 6 ++---- content/events/src/nsEventListenerManager.cpp | 4 ++-- content/events/src/nsEventStateManager.cpp | 4 ++-- .../html/content/src/nsGenericHTMLElement.cpp | 6 ++---- .../html/content/src/nsHTMLFormElement.cpp | 4 ++-- .../html/content/src/nsHTMLSelectElement.cpp | 6 ++---- .../html/content/src/nsTextEditorState.cpp | 4 ++-- .../src/nsHTMLFragmentContentSink.cpp | 6 ++---- content/xbl/src/nsXBLDocumentInfo.cpp | 9 ++++----- content/xslt/src/xpath/nsXPathExpression.cpp | 6 ++---- content/xslt/src/xpath/nsXPathResult.cpp | 4 ++-- content/xul/document/src/nsXULControllers.cpp | 4 ++-- content/xul/document/src/nsXULDocument.cpp | 3 --- content/xul/document/src/nsXULDocument.h | 3 ++- .../document/src/nsXULPrototypeDocument.cpp | 12 ++++------- .../templates/src/nsXULTemplateBuilder.cpp | 6 ++---- .../src/nsXULTemplateQueryProcessorRDF.cpp | 6 ++---- .../src/nsXULTemplateQueryProcessorXML.cpp | 6 ++---- dom/base/nsGlobalWindow.cpp | 5 ++--- dom/base/nsJSEnvironment.cpp | 8 ++++---- dom/base/nsWindowRoot.cpp | 4 ++-- dom/src/events/nsJSEventListener.cpp | 4 ++-- dom/src/storage/nsDOMStorage.cpp | 12 +++++------ editor/libeditor/base/EditTxn.cpp | 4 ++-- editor/libeditor/base/nsEditor.cpp | 4 ++-- editor/txmgr/src/nsTransactionManager.cpp | 6 ++---- .../commandhandler/src/nsCommandManager.cpp | 4 ++-- parser/htmlparser/src/nsParser.cpp | 4 ++-- parser/xml/src/nsSAXXMLReader.cpp | 4 ++-- rdf/base/src/nsCompositeDataSource.cpp | 6 ++---- rdf/base/src/nsRDFXMLDataSource.cpp | 6 ++---- rdf/datasource/src/nsLocalStore.cpp | 4 ++-- toolkit/components/intl/nsCharsetMenu.cpp | 4 ++-- .../components/places/nsNavHistoryResult.cpp | 4 ++-- xpcom/glue/nsISupportsImpl.h | 20 ++++--------------- .../directory/nsDirectoryViewer.cpp | 4 ++-- .../windowds/nsWindowDataSource.cpp | 6 ++---- 46 files changed, 109 insertions(+), 160 deletions(-) diff --git a/accessible/src/base/nsAccessNode.cpp b/accessible/src/base/nsAccessNode.cpp index 9b2d07d9f3e..aadbe4399da 100644 --- a/accessible/src/base/nsAccessNode.cpp +++ b/accessible/src/base/nsAccessNode.cpp @@ -101,9 +101,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsAccessNode) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAccessNode) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsAccessNode, nsIAccessNode) -NS_IMPL_CYCLE_COLLECTING_RELEASE_FULL(nsAccessNode, nsIAccessNode, - LastRelease()) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsAccessNode) +NS_IMPL_CYCLE_COLLECTING_RELEASE_WITH_DESTROY(nsAccessNode, LastRelease()) //////////////////////////////////////////////////////////////////////////////// // nsAccessNode construction/desctruction diff --git a/content/base/src/nsDOMAttribute.cpp b/content/base/src/nsDOMAttribute.cpp index bc5a7c6626a..21358b51b8d 100644 --- a/content/base/src/nsDOMAttribute.cpp +++ b/content/base/src/nsDOMAttribute.cpp @@ -145,9 +145,9 @@ NS_INTERFACE_TABLE_HEAD(nsDOMAttribute) NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Attr) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsDOMAttribute, nsIDOMAttr) -NS_IMPL_CYCLE_COLLECTING_RELEASE_FULL(nsDOMAttribute, nsIDOMAttr, - nsNodeUtils::LastRelease(this)) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMAttribute) +NS_IMPL_CYCLE_COLLECTING_RELEASE_WITH_DESTROY(nsDOMAttribute, + nsNodeUtils::LastRelease(this)) void nsDOMAttribute::SetMap(nsDOMAttributeMap *aMap) diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index 7b078bd2ed4..dd2a8527e3d 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -1759,10 +1759,9 @@ NS_INTERFACE_TABLE_HEAD(nsDocument) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsDocument, nsIDocument) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS_WITH_DESTROY(nsDocument, - nsIDocument, - nsNodeUtils::LastRelease(this)) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDocument) +NS_IMPL_CYCLE_COLLECTING_RELEASE_WITH_DESTROY(nsDocument, + nsNodeUtils::LastRelease(this)) static PLDHashOperator SubDocTraverser(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, diff --git a/content/base/src/nsFrameLoader.cpp b/content/base/src/nsFrameLoader.cpp index e8ef29c8b2b..a5fae942dfd 100644 --- a/content/base/src/nsFrameLoader.cpp +++ b/content/base/src/nsFrameLoader.cpp @@ -300,8 +300,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsFrameLoader) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mChildMessageManager) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsFrameLoader, nsIFrameLoader) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsFrameLoader, nsIFrameLoader) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsFrameLoader) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsFrameLoader) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsFrameLoader) NS_INTERFACE_MAP_ENTRY(nsIFrameLoader) diff --git a/content/base/src/nsFrameMessageManager.cpp b/content/base/src/nsFrameMessageManager.cpp index 3df40069cc7..9d2f540b70b 100644 --- a/content/base/src/nsFrameMessageManager.cpp +++ b/content/base/src/nsFrameMessageManager.cpp @@ -101,10 +101,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsFrameMessageManager) mChrome && !mIsProcessManager) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsFrameMessageManager, - nsIContentFrameMessageManager) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsFrameMessageManager, - nsIContentFrameMessageManager) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsFrameMessageManager) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsFrameMessageManager) NS_IMETHODIMP nsFrameMessageManager::AddMessageListener(const nsAString& aMessage, diff --git a/content/base/src/nsGenericDOMDataNode.cpp b/content/base/src/nsGenericDOMDataNode.cpp index c159c11d2bc..ade08970c6d 100644 --- a/content/base/src/nsGenericDOMDataNode.cpp +++ b/content/base/src/nsGenericDOMDataNode.cpp @@ -138,9 +138,9 @@ NS_INTERFACE_MAP_BEGIN(nsGenericDOMDataNode) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIContent) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsGenericDOMDataNode, nsIContent) -NS_IMPL_CYCLE_COLLECTING_RELEASE_FULL(nsGenericDOMDataNode, nsIContent, - nsNodeUtils::LastRelease(this)) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsGenericDOMDataNode) +NS_IMPL_CYCLE_COLLECTING_RELEASE_WITH_DESTROY(nsGenericDOMDataNode, + nsNodeUtils::LastRelease(this)) nsresult diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp index 34f116530b7..b92957e39f1 100644 --- a/content/base/src/nsGenericElement.cpp +++ b/content/base/src/nsGenericElement.cpp @@ -1930,11 +1930,9 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMEventRTTearoff) NS_INTERFACE_MAP_ENTRY(nsIDOMNSEventTarget) NS_INTERFACE_MAP_END_AGGREGATED(mNode) -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsDOMEventRTTearoff, - nsIDOMEventTarget) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS_WITH_DESTROY(nsDOMEventRTTearoff, - nsIDOMEventTarget, - LastRelease()) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMEventRTTearoff) +NS_IMPL_CYCLE_COLLECTING_RELEASE_WITH_DESTROY(nsDOMEventRTTearoff, + LastRelease()) nsDOMEventRTTearoff * nsDOMEventRTTearoff::Create(nsINode *aNode) @@ -4500,10 +4498,9 @@ NS_INTERFACE_MAP_BEGIN(nsGenericElement) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIContent) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsGenericElement, nsIContent) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS_WITH_DESTROY(nsGenericElement, - nsIContent, - nsNodeUtils::LastRelease(this)) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsGenericElement) +NS_IMPL_CYCLE_COLLECTING_RELEASE_WITH_DESTROY(nsGenericElement, + nsNodeUtils::LastRelease(this)) nsresult nsGenericElement::PostQueryInterface(REFNSIID aIID, void** aInstancePtr) diff --git a/content/canvas/src/WebGLContext.cpp b/content/canvas/src/WebGLContext.cpp index a6715920acb..61680fd5dce 100644 --- a/content/canvas/src/WebGLContext.cpp +++ b/content/canvas/src/WebGLContext.cpp @@ -765,8 +765,8 @@ WebGLContext::MozGetUnderlyingParamString(PRUint32 pname, nsAString& retval) // XPCOM goop // -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(WebGLContext, nsIDOMWebGLRenderingContext) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(WebGLContext, nsIDOMWebGLRenderingContext) +NS_IMPL_CYCLE_COLLECTING_ADDREF(WebGLContext) +NS_IMPL_CYCLE_COLLECTING_RELEASE(WebGLContext) NS_IMPL_CYCLE_COLLECTION_CLASS(WebGLContext) NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(WebGLContext) diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp index e29d74ad794..b7f4c7dad81 100644 --- a/content/canvas/src/nsCanvasRenderingContext2D.cpp +++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp @@ -776,8 +776,8 @@ protected: friend struct nsCanvasBidiProcessor; }; -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsCanvasRenderingContext2D, nsIDOMCanvasRenderingContext2D) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsCanvasRenderingContext2D, nsIDOMCanvasRenderingContext2D) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsCanvasRenderingContext2D) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsCanvasRenderingContext2D) NS_IMPL_CYCLE_COLLECTION_CLASS(nsCanvasRenderingContext2D) NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsCanvasRenderingContext2D) diff --git a/content/events/src/nsDOMEventTargetHelper.cpp b/content/events/src/nsDOMEventTargetHelper.cpp index 35dd4564397..836fb18cf8c 100644 --- a/content/events/src/nsDOMEventTargetHelper.cpp +++ b/content/events/src/nsDOMEventTargetHelper.cpp @@ -86,10 +86,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMEventTargetHelper) NS_INTERFACE_MAP_ENTRY(nsIDOMNSEventTarget) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsDOMEventTargetHelper, - nsPIDOMEventTarget) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsDOMEventTargetHelper, - nsPIDOMEventTarget) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMEventTargetHelper) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMEventTargetHelper) NS_IMETHODIMP diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp index d1a7bb4e1be..5e060689e26 100644 --- a/content/events/src/nsEventListenerManager.cpp +++ b/content/events/src/nsEventListenerManager.cpp @@ -342,8 +342,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsEventListenerManager) NS_INTERFACE_MAP_ENTRY(nsIDOM3EventTarget) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsEventListenerManager, nsIEventListenerManager) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsEventListenerManager, nsIEventListenerManager) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsEventListenerManager) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsEventListenerManager) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsEventListenerManager) PRUint32 count = tmp->mListeners.Length(); diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp index 5b5fb1a32d4..ff936682ab9 100644 --- a/content/events/src/nsEventStateManager.cpp +++ b/content/events/src/nsEventStateManager.cpp @@ -1001,8 +1001,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsEventStateManager) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsEventStateManager, nsIEventStateManager) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsEventStateManager, nsIEventStateManager) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsEventStateManager) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsEventStateManager) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsEventStateManager) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mCurrentTargetContent); diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp index 4b65560eb29..c9ceb1c27b5 100644 --- a/content/html/content/src/nsGenericHTMLElement.cpp +++ b/content/html/content/src/nsGenericHTMLElement.cpp @@ -266,10 +266,8 @@ private: NS_IMPL_CYCLE_COLLECTION_1(nsGenericHTMLElementTearoff, mElement) -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsGenericHTMLElementTearoff, - nsIDOMNSHTMLElement) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsGenericHTMLElementTearoff, - nsIDOMNSHTMLElement) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsGenericHTMLElementTearoff) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsGenericHTMLElementTearoff) NS_INTERFACE_TABLE_HEAD(nsGenericHTMLElementTearoff) NS_INTERFACE_TABLE_INHERITED2(nsGenericHTMLElementTearoff, diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp index 135d8708223..4adc9cfde2a 100644 --- a/content/html/content/src/nsHTMLFormElement.cpp +++ b/content/html/content/src/nsHTMLFormElement.cpp @@ -2293,8 +2293,8 @@ NS_INTERFACE_TABLE_HEAD(nsFormControlList) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsFormControlList, nsIHTMLCollection) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsFormControlList, nsIHTMLCollection) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsFormControlList) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsFormControlList) // nsIDOMHTMLCollection interface diff --git a/content/html/content/src/nsHTMLSelectElement.cpp b/content/html/content/src/nsHTMLSelectElement.cpp index b7e30850d57..26d30c1e7e2 100644 --- a/content/html/content/src/nsHTMLSelectElement.cpp +++ b/content/html/content/src/nsHTMLSelectElement.cpp @@ -2091,10 +2091,8 @@ NS_INTERFACE_TABLE_HEAD(nsHTMLOptionCollection) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsHTMLOptionCollection, - nsIHTMLCollection) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsHTMLOptionCollection, - nsIHTMLCollection) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsHTMLOptionCollection) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsHTMLOptionCollection) // nsIDOMNSHTMLOptionCollection interface diff --git a/content/html/content/src/nsTextEditorState.cpp b/content/html/content/src/nsTextEditorState.cpp index 125277666fc..45448458b78 100644 --- a/content/html/content/src/nsTextEditorState.cpp +++ b/content/html/content/src/nsTextEditorState.cpp @@ -220,8 +220,8 @@ private: nsWeakPtr mPresShellWeak; }; -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsTextInputSelectionImpl, nsISelectionController) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsTextInputSelectionImpl, nsISelectionController) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsTextInputSelectionImpl) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsTextInputSelectionImpl) NS_INTERFACE_TABLE_HEAD(nsTextInputSelectionImpl) NS_INTERFACE_TABLE3(nsTextInputSelectionImpl, nsISelectionController, diff --git a/content/html/document/src/nsHTMLFragmentContentSink.cpp b/content/html/document/src/nsHTMLFragmentContentSink.cpp index b1a666b5024..090e74454fe 100644 --- a/content/html/document/src/nsHTMLFragmentContentSink.cpp +++ b/content/html/document/src/nsHTMLFragmentContentSink.cpp @@ -233,10 +233,8 @@ nsHTMLFragmentContentSink::~nsHTMLFragmentContentSink() } } -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsHTMLFragmentContentSink, - nsIContentSink) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsHTMLFragmentContentSink, - nsIContentSink) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsHTMLFragmentContentSink) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsHTMLFragmentContentSink) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsHTMLFragmentContentSink) NS_INTERFACE_MAP_ENTRY(nsIFragmentContentSink) diff --git a/content/xbl/src/nsXBLDocumentInfo.cpp b/content/xbl/src/nsXBLDocumentInfo.cpp index 796ff5f129b..19925a76b69 100644 --- a/content/xbl/src/nsXBLDocumentInfo.cpp +++ b/content/xbl/src/nsXBLDocumentInfo.cpp @@ -215,8 +215,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXBLDocGlobalObject) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIScriptGlobalObject) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXBLDocGlobalObject, nsIScriptGlobalObject) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsXBLDocGlobalObject, nsIScriptGlobalObject) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXBLDocGlobalObject) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXBLDocGlobalObject) void XBL_ProtoErrorReporter(JSContext *cx, @@ -494,9 +494,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXBLDocumentInfo) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIScriptGlobalObjectOwner) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXBLDocumentInfo, nsIScriptGlobalObjectOwner) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsXBLDocumentInfo, - nsIScriptGlobalObjectOwner) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXBLDocumentInfo) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXBLDocumentInfo) nsXBLDocumentInfo::nsXBLDocumentInfo(nsIDocument* aDocument) : mDocument(aDocument), diff --git a/content/xslt/src/xpath/nsXPathExpression.cpp b/content/xslt/src/xpath/nsXPathExpression.cpp index dddf8bf6229..6cb255dafc5 100644 --- a/content/xslt/src/xpath/nsXPathExpression.cpp +++ b/content/xslt/src/xpath/nsXPathExpression.cpp @@ -51,10 +51,8 @@ NS_IMPL_CYCLE_COLLECTION_1(nsXPathExpression, mDocument) -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXPathExpression, - nsIDOMXPathExpression) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsXPathExpression, - nsIDOMXPathExpression) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXPathExpression) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXPathExpression) DOMCI_DATA(XPathExpression, nsXPathExpression) diff --git a/content/xslt/src/xpath/nsXPathResult.cpp b/content/xslt/src/xpath/nsXPathResult.cpp index bbe604c1382..6b329ba1091 100644 --- a/content/xslt/src/xpath/nsXPathResult.cpp +++ b/content/xslt/src/xpath/nsXPathResult.cpp @@ -91,8 +91,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXPathResult) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMARRAY(mResultNodes) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXPathResult, nsIDOMXPathResult) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsXPathResult, nsIDOMXPathResult) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXPathResult) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXPathResult) DOMCI_DATA(XPathResult, nsXPathResult) diff --git a/content/xul/document/src/nsXULControllers.cpp b/content/xul/document/src/nsXULControllers.cpp index 078c6a0e16d..3b6d68c2ded 100644 --- a/content/xul/document/src/nsXULControllers.cpp +++ b/content/xul/document/src/nsXULControllers.cpp @@ -122,8 +122,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULControllers) NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XULControllers) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXULControllers, nsIControllers) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsXULControllers, nsIControllers) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXULControllers) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXULControllers) NS_IMETHODIMP nsXULControllers::GetControllerForCommand(const char *aCommand, nsIController** _retval) diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp index 360ce06e349..95b96f44e20 100644 --- a/content/xul/document/src/nsXULDocument.cpp +++ b/content/xul/document/src/nsXULDocument.cpp @@ -388,9 +388,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsXULDocument, nsXMLDocument) tmp->mPendingOverlayLoadNotifications.EnumerateRead(TraverseObservers, &cb); NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsXULDocument, nsXMLDocument) -NS_IMPL_CYCLE_COLLECTION_UNLINK_END - NS_IMPL_ADDREF_INHERITED(nsXULDocument, nsXMLDocument) NS_IMPL_RELEASE_INHERITED(nsXULDocument, nsXMLDocument) diff --git a/content/xul/document/src/nsXULDocument.h b/content/xul/document/src/nsXULDocument.h index 7ed90e89049..c56d4dc2d29 100644 --- a/content/xul/document/src/nsXULDocument.h +++ b/content/xul/document/src/nsXULDocument.h @@ -202,7 +202,8 @@ public: nsIAtom* aAttrName, void* aData); - NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsXULDocument, nsXMLDocument) + NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_NO_UNLINK(nsXULDocument, + nsXMLDocument) virtual nsXPCClassInfo* GetClassInfo(); protected: diff --git a/content/xul/document/src/nsXULPrototypeDocument.cpp b/content/xul/document/src/nsXULPrototypeDocument.cpp index 0d96adc5386..0ce9f54a064 100644 --- a/content/xul/document/src/nsXULPrototypeDocument.cpp +++ b/content/xul/document/src/nsXULPrototypeDocument.cpp @@ -205,10 +205,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULPrototypeDocument) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIScriptGlobalObjectOwner) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXULPrototypeDocument, - nsIScriptGlobalObjectOwner) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsXULPrototypeDocument, - nsIScriptGlobalObjectOwner) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXULPrototypeDocument) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXULPrototypeDocument) NS_IMETHODIMP NS_NewXULPrototypeDocument(nsXULPrototypeDocument** aResult) @@ -657,10 +655,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULPDGlobalObject) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIScriptGlobalObject) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXULPDGlobalObject, - nsIScriptGlobalObject) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsXULPDGlobalObject, - nsIScriptGlobalObject) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXULPDGlobalObject) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXULPDGlobalObject) //---------------------------------------------------------------------- // diff --git a/content/xul/templates/src/nsXULTemplateBuilder.cpp b/content/xul/templates/src/nsXULTemplateBuilder.cpp index 60a411c19a2..b489286e6e1 100644 --- a/content/xul/templates/src/nsXULTemplateBuilder.cpp +++ b/content/xul/templates/src/nsXULTemplateBuilder.cpp @@ -301,10 +301,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXULTemplateBuilder) tmp->Traverse(cb); NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXULTemplateBuilder, - nsIXULTemplateBuilder) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsXULTemplateBuilder, - nsIXULTemplateBuilder) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXULTemplateBuilder) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXULTemplateBuilder) DOMCI_DATA(XULTemplateBuilder, nsXULTemplateBuilder) diff --git a/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp b/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp index 91a9bc90fc0..2da067d8882 100644 --- a/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp +++ b/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp @@ -148,10 +148,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXULTemplateQueryProcessorRDF) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMARRAY(mQueries) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXULTemplateQueryProcessorRDF, - nsIXULTemplateQueryProcessor) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsXULTemplateQueryProcessorRDF, - nsIXULTemplateQueryProcessor) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXULTemplateQueryProcessorRDF) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXULTemplateQueryProcessorRDF) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULTemplateQueryProcessorRDF) NS_INTERFACE_MAP_ENTRY(nsIXULTemplateQueryProcessor) NS_INTERFACE_MAP_ENTRY(nsIRDFObserver) diff --git a/content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp b/content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp index 53067685972..7518aab7ff3 100644 --- a/content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp +++ b/content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp @@ -140,10 +140,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXULTemplateQueryProcessorXML) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTemplateBuilder) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mRequest) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXULTemplateQueryProcessorXML, - nsIXULTemplateQueryProcessor) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsXULTemplateQueryProcessorXML, - nsIXULTemplateQueryProcessor) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXULTemplateQueryProcessorXML) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXULTemplateQueryProcessorXML) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULTemplateQueryProcessorXML) NS_INTERFACE_MAP_ENTRY(nsIXULTemplateQueryProcessor) NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener) diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index 13eefa340dd..02739dc5583 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -1340,9 +1340,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGlobalWindow) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsGlobalWindow, nsIScriptGlobalObject) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsGlobalWindow, - nsIScriptGlobalObject) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsGlobalWindow) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsGlobalWindow) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsGlobalWindow) diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp index 9e4107bb1a2..51c85f1bf13 100644 --- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -1137,8 +1137,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsJSContext) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsJSContext, nsIScriptContext) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsJSContext, nsIScriptContext) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsJSContext) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsJSContext) nsrefcnt nsJSContext::GetCCRefcnt() @@ -4007,8 +4007,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsJSArgArray) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIJSArgArray) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsJSArgArray, nsIJSArgArray) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsJSArgArray, nsIJSArgArray) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsJSArgArray) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsJSArgArray) nsresult nsJSArgArray::GetArgs(PRUint32 *argc, void **argv) diff --git a/dom/base/nsWindowRoot.cpp b/dom/base/nsWindowRoot.cpp index 3bfb62a17ca..67e3295a9b0 100644 --- a/dom/base/nsWindowRoot.cpp +++ b/dom/base/nsWindowRoot.cpp @@ -92,8 +92,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsWindowRoot) NS_INTERFACE_MAP_ENTRY(nsIDOMNSEventTarget) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsWindowRoot, nsIDOMEventTarget) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsWindowRoot, nsIDOMEventTarget) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsWindowRoot) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsWindowRoot) NS_IMETHODIMP nsWindowRoot::AddEventListener(const nsAString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture) diff --git a/dom/src/events/nsJSEventListener.cpp b/dom/src/events/nsJSEventListener.cpp index 9c21aae9d52..df313ea3fca 100644 --- a/dom/src/events/nsJSEventListener.cpp +++ b/dom/src/events/nsJSEventListener.cpp @@ -126,8 +126,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsJSEventListener) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMEventListener) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsJSEventListener, nsIDOMEventListener) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsJSEventListener, nsIDOMEventListener) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsJSEventListener) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsJSEventListener) nsresult nsJSEventListener::GetJSVal(const nsAString& aEventName, jsval* aJSVal) diff --git a/dom/src/storage/nsDOMStorage.cpp b/dom/src/storage/nsDOMStorage.cpp index 4e852322f2d..b34a41a86c9 100644 --- a/dom/src/storage/nsDOMStorage.cpp +++ b/dom/src/storage/nsDOMStorage.cpp @@ -585,8 +585,8 @@ NS_IMPL_CYCLE_COLLECTION_1(nsDOMStorage, mStorageImpl) DOMCI_DATA(StorageObsolete, nsDOMStorage) -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsDOMStorage, nsIDOMStorageObsolete) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsDOMStorage, nsIDOMStorageObsolete) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMStorage) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMStorage) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMStorage) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMStorageObsolete) NS_INTERFACE_MAP_ENTRY(nsIDOMStorageObsolete) @@ -1785,8 +1785,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END DOMCI_DATA(Storage, nsDOMStorage2) -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsDOMStorage2, nsIDOMStorage) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsDOMStorage2, nsIDOMStorage) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMStorage2) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMStorage2) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMStorage2) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMStorage) NS_INTERFACE_MAP_ENTRY(nsIDOMStorage) @@ -2200,8 +2200,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsDOMStorageItem) } NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsDOMStorageItem, nsIDOMStorageItem) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsDOMStorageItem, nsIDOMStorageItem) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMStorageItem) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMStorageItem) DOMCI_DATA(StorageItem, nsDOMStorageItem) diff --git a/editor/libeditor/base/EditTxn.cpp b/editor/libeditor/base/EditTxn.cpp index 58449fae3f1..6b602fd3485 100644 --- a/editor/libeditor/base/EditTxn.cpp +++ b/editor/libeditor/base/EditTxn.cpp @@ -46,8 +46,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(EditTxn) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsITransaction) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(EditTxn, nsITransaction) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(EditTxn, nsITransaction) +NS_IMPL_CYCLE_COLLECTING_ADDREF(EditTxn) +NS_IMPL_CYCLE_COLLECTING_RELEASE(EditTxn) EditTxn::~EditTxn() { diff --git a/editor/libeditor/base/nsEditor.cpp b/editor/libeditor/base/nsEditor.cpp index f317b837abf..dedb118ecbc 100644 --- a/editor/libeditor/base/nsEditor.cpp +++ b/editor/libeditor/base/nsEditor.cpp @@ -213,8 +213,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsEditor) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIEditor) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsEditor, nsIEditor) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsEditor, nsIEditor) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsEditor) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsEditor) #ifdef XP_MAC #pragma mark - diff --git a/editor/txmgr/src/nsTransactionManager.cpp b/editor/txmgr/src/nsTransactionManager.cpp index e009b90dec4..b233ac705e2 100644 --- a/editor/txmgr/src/nsTransactionManager.cpp +++ b/editor/txmgr/src/nsTransactionManager.cpp @@ -87,10 +87,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsTransactionManager) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsITransactionManager) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsTransactionManager, - nsITransactionManager) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsTransactionManager, - nsITransactionManager) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsTransactionManager) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsTransactionManager) NS_IMETHODIMP nsTransactionManager::DoTransaction(nsITransaction *aTransaction) diff --git a/embedding/components/commandhandler/src/nsCommandManager.cpp b/embedding/components/commandhandler/src/nsCommandManager.cpp index 2b93898b3b8..c3d9cf7e6c9 100644 --- a/embedding/components/commandhandler/src/nsCommandManager.cpp +++ b/embedding/components/commandhandler/src/nsCommandManager.cpp @@ -95,8 +95,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsCommandManager) tmp->mObserversTable.EnumerateRead(TraverseCommandObservers, &cb); NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsCommandManager, nsICommandManager) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsCommandManager, nsICommandManager) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsCommandManager) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsCommandManager) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCommandManager) NS_INTERFACE_MAP_ENTRY(nsICommandManager) diff --git a/parser/htmlparser/src/nsParser.cpp b/parser/htmlparser/src/nsParser.cpp index f4fc3ae3da3..7cb1d32bf2d 100644 --- a/parser/htmlparser/src/nsParser.cpp +++ b/parser/htmlparser/src/nsParser.cpp @@ -869,8 +869,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsParser) } NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsParser, nsIParser) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsParser, nsIParser) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsParser) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsParser) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsParser) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) NS_INTERFACE_MAP_ENTRY(nsIParser) diff --git a/parser/xml/src/nsSAXXMLReader.cpp b/parser/xml/src/nsSAXXMLReader.cpp index 1eb3cec750f..5166b321344 100644 --- a/parser/xml/src/nsSAXXMLReader.cpp +++ b/parser/xml/src/nsSAXXMLReader.cpp @@ -71,8 +71,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsSAXXMLReader) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mListener) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mParserObserver) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsSAXXMLReader, nsISAXXMLReader) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsSAXXMLReader, nsISAXXMLReader) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsSAXXMLReader) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsSAXXMLReader) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSAXXMLReader) NS_INTERFACE_MAP_ENTRY(nsISAXXMLReader) NS_INTERFACE_MAP_ENTRY(nsIExpatSink) diff --git a/rdf/base/src/nsCompositeDataSource.cpp b/rdf/base/src/nsCompositeDataSource.cpp index fb63dacf753..2ffe4080a3e 100644 --- a/rdf/base/src/nsCompositeDataSource.cpp +++ b/rdf/base/src/nsCompositeDataSource.cpp @@ -654,10 +654,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(CompositeDataSourceImpl) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(CompositeDataSourceImpl, - nsIRDFCompositeDataSource) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(CompositeDataSourceImpl, - nsIRDFCompositeDataSource) +NS_IMPL_CYCLE_COLLECTING_ADDREF(CompositeDataSourceImpl) +NS_IMPL_CYCLE_COLLECTING_RELEASE(CompositeDataSourceImpl) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CompositeDataSourceImpl) NS_INTERFACE_MAP_ENTRY(nsIRDFCompositeDataSource) diff --git a/rdf/base/src/nsRDFXMLDataSource.cpp b/rdf/base/src/nsRDFXMLDataSource.cpp index 6c9760996b9..a7504758458 100644 --- a/rdf/base/src/nsRDFXMLDataSource.cpp +++ b/rdf/base/src/nsRDFXMLDataSource.cpp @@ -480,10 +480,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(RDFXMLDataSourceImpl) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mInner) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(RDFXMLDataSourceImpl, - nsIRDFDataSource) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(RDFXMLDataSourceImpl, - nsIRDFDataSource) +NS_IMPL_CYCLE_COLLECTING_ADDREF(RDFXMLDataSourceImpl) +NS_IMPL_CYCLE_COLLECTING_RELEASE(RDFXMLDataSourceImpl) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(RDFXMLDataSourceImpl) NS_INTERFACE_MAP_ENTRY(nsIRDFDataSource) diff --git a/rdf/datasource/src/nsLocalStore.cpp b/rdf/datasource/src/nsLocalStore.cpp index 82b19571812..b6a69a68349 100644 --- a/rdf/datasource/src/nsLocalStore.cpp +++ b/rdf/datasource/src/nsLocalStore.cpp @@ -267,8 +267,8 @@ NS_NewLocalStore(nsISupports* aOuter, REFNSIID aIID, void** aResult) } NS_IMPL_CYCLE_COLLECTION_1(LocalStoreImpl, mInner) -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(LocalStoreImpl, nsILocalStore) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(LocalStoreImpl, nsILocalStore) +NS_IMPL_CYCLE_COLLECTING_ADDREF(LocalStoreImpl) +NS_IMPL_CYCLE_COLLECTING_RELEASE(LocalStoreImpl) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(LocalStoreImpl) NS_INTERFACE_MAP_ENTRY(nsILocalStore) diff --git a/toolkit/components/intl/nsCharsetMenu.cpp b/toolkit/components/intl/nsCharsetMenu.cpp index 9f373ee3846..160fed9d5af 100644 --- a/toolkit/components/intl/nsCharsetMenu.cpp +++ b/toolkit/components/intl/nsCharsetMenu.cpp @@ -480,8 +480,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsCharsetMenu) cb.NoteXPCOMChild(nsCharsetMenu::mInner); NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsCharsetMenu, nsIRDFDataSource) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsCharsetMenu, nsIRDFDataSource) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsCharsetMenu) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsCharsetMenu) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCharsetMenu) NS_INTERFACE_MAP_ENTRY(nsIRDFDataSource) NS_INTERFACE_MAP_ENTRY(nsICurrentCharsetListener) diff --git a/toolkit/components/places/nsNavHistoryResult.cpp b/toolkit/components/places/nsNavHistoryResult.cpp index b7e85e0ab9c..f0645781887 100644 --- a/toolkit/components/places/nsNavHistoryResult.cpp +++ b/toolkit/components/places/nsNavHistoryResult.cpp @@ -228,8 +228,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsNavHistoryResultNode) NS_INTERFACE_MAP_ENTRY(nsINavHistoryResultNode) NS_INTERFACE_MAP_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsNavHistoryResultNode, nsINavHistoryResultNode) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsNavHistoryResultNode, nsINavHistoryResultNode) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsNavHistoryResultNode) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsNavHistoryResultNode) nsNavHistoryResultNode::nsNavHistoryResultNode( const nsACString& aURI, const nsACString& aTitle, PRUint32 aAccessCount, diff --git a/xpcom/glue/nsISupportsImpl.h b/xpcom/glue/nsISupportsImpl.h index 252bbd682f8..c7e11755087 100644 --- a/xpcom/glue/nsISupportsImpl.h +++ b/xpcom/glue/nsISupportsImpl.h @@ -442,7 +442,7 @@ NS_IMETHODIMP_(nsrefcnt) _class::Release(void) \ } -#define NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(_class, _basetype) \ +#define NS_IMPL_CYCLE_COLLECTING_ADDREF(_class) \ NS_IMETHODIMP_(nsrefcnt) _class::AddRef(void) \ { \ NS_PRECONDITION(PRInt32(mRefCnt) >= 0, "illegal refcnt"); \ @@ -453,10 +453,7 @@ NS_IMETHODIMP_(nsrefcnt) _class::AddRef(void) \ return count; \ } -#define NS_IMPL_CYCLE_COLLECTING_ADDREF(_class) \ - NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(_class, _class) - -#define NS_IMPL_CYCLE_COLLECTING_RELEASE_FULL(_class, _basetype, _destroy) \ +#define NS_IMPL_CYCLE_COLLECTING_RELEASE_WITH_DESTROY(_class, _destroy) \ NS_IMETHODIMP_(nsrefcnt) _class::Release(void) \ { \ NS_PRECONDITION(0 != mRefCnt, "dup release"); \ @@ -473,17 +470,8 @@ NS_IMETHODIMP_(nsrefcnt) _class::Release(void) \ return count; \ } -#define NS_IMPL_CYCLE_COLLECTING_RELEASE_WITH_DESTROY(_class, _destroy) \ - NS_IMPL_CYCLE_COLLECTING_RELEASE_FULL(_class, _class, _destroy) - -#define NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS_WITH_DESTROY(_class, _basetype, _destroy) \ - NS_IMPL_CYCLE_COLLECTING_RELEASE_FULL(_class, _basetype, _destroy) - -#define NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(_class, _basetype) \ - NS_IMPL_CYCLE_COLLECTING_RELEASE_FULL(_class, _basetype, delete (this)) - -#define NS_IMPL_CYCLE_COLLECTING_RELEASE(_class) \ - NS_IMPL_CYCLE_COLLECTING_RELEASE_FULL(_class, _class, delete (this)) +#define NS_IMPL_CYCLE_COLLECTING_RELEASE(_class) \ + NS_IMPL_CYCLE_COLLECTING_RELEASE_WITH_DESTROY(_class, delete (this)) /////////////////////////////////////////////////////////////////////////////// diff --git a/xpfe/components/directory/nsDirectoryViewer.cpp b/xpfe/components/directory/nsDirectoryViewer.cpp index 2f8e832650f..2a0584b1282 100644 --- a/xpfe/components/directory/nsDirectoryViewer.cpp +++ b/xpfe/components/directory/nsDirectoryViewer.cpp @@ -126,8 +126,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsHTTPIndex) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTION_1(nsHTTPIndex, mInner) -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsHTTPIndex, nsIHttpIndex) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsHTTPIndex, nsIHttpIndex) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsHTTPIndex) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsHTTPIndex) NS_IMETHODIMP nsHTTPIndex::GetInterface(const nsIID &anIID, void **aResult ) diff --git a/xpfe/components/windowds/nsWindowDataSource.cpp b/xpfe/components/windowds/nsWindowDataSource.cpp index 6d6c2b8a6fd..29b84a30b56 100644 --- a/xpfe/components/windowds/nsWindowDataSource.cpp +++ b/xpfe/components/windowds/nsWindowDataSource.cpp @@ -135,10 +135,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsWindowDataSource) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mInner) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsWindowDataSource, - nsIObserver) -NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsWindowDataSource, - nsIObserver) +NS_IMPL_CYCLE_COLLECTING_ADDREF(nsWindowDataSource) +NS_IMPL_CYCLE_COLLECTING_RELEASE(nsWindowDataSource) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsWindowDataSource) NS_INTERFACE_MAP_ENTRY(nsIObserver)