diff --git a/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp index d4c5ac73a32..993fe2e64f1 100644 --- a/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp +++ b/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp @@ -2531,7 +2531,7 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsBookmarksService, NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsBookmarksService, nsIBookmarksService) -NS_INTERFACE_MAP_BEGIN(nsBookmarksService) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsBookmarksService) NS_INTERFACE_MAP_ENTRY(nsIBookmarksService) NS_INTERFACE_MAP_ENTRY(nsIRDFDataSource) NS_INTERFACE_MAP_ENTRY(nsIRDFRemoteDataSource) @@ -2542,7 +2542,6 @@ NS_INTERFACE_MAP_BEGIN(nsBookmarksService) NS_INTERFACE_MAP_ENTRY(nsIObserver) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIBookmarksService) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsBookmarksService) NS_INTERFACE_MAP_END diff --git a/mozilla/browser/components/bookmarks/src/nsForwardProxyDataSource.cpp b/mozilla/browser/components/bookmarks/src/nsForwardProxyDataSource.cpp index 08d0bfaded9..b597092e6c0 100644 --- a/mozilla/browser/components/bookmarks/src/nsForwardProxyDataSource.cpp +++ b/mozilla/browser/components/bookmarks/src/nsForwardProxyDataSource.cpp @@ -151,12 +151,11 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsForwardProxyDataSource, NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsForwardProxyDataSource, nsIRDFInferDataSource) -NS_INTERFACE_MAP_BEGIN(nsForwardProxyDataSource) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsForwardProxyDataSource) NS_INTERFACE_MAP_ENTRY(nsIRDFInferDataSource) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIRDFDataSource, nsIRDFInferDataSource) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIRDFInferDataSource) NS_INTERFACE_MAP_ENTRY(nsIRDFObserver) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsForwardProxyDataSource) NS_INTERFACE_MAP_END //---------------------------------------------------------------------- diff --git a/mozilla/content/base/src/nsContentList.cpp b/mozilla/content/base/src/nsContentList.cpp index 1efc56502cc..e96936e7d90 100644 --- a/mozilla/content/base/src/nsContentList.cpp +++ b/mozilla/content/base/src/nsContentList.cpp @@ -87,11 +87,10 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsBaseContentList) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END // QueryInterface implementation for nsBaseContentList -NS_INTERFACE_MAP_BEGIN(nsBaseContentList) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsBaseContentList) NS_INTERFACE_MAP_ENTRY(nsIDOMNodeList) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMNodeList) NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(NodeList) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsBaseContentList) NS_INTERFACE_MAP_END diff --git a/mozilla/content/base/src/nsDOMAttribute.cpp b/mozilla/content/base/src/nsDOMAttribute.cpp index 05721d2c271..ed82910b0c5 100644 --- a/mozilla/content/base/src/nsDOMAttribute.cpp +++ b/mozilla/content/base/src/nsDOMAttribute.cpp @@ -86,7 +86,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDOMAttribute) NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER NS_IMPL_CYCLE_COLLECTION_UNLINK_END // QueryInterface implementation for nsDOMAttribute -NS_INTERFACE_MAP_BEGIN(nsDOMAttribute) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMAttribute) NS_INTERFACE_MAP_ENTRY(nsIDOMAttr) NS_INTERFACE_MAP_ENTRY(nsIAttribute) NS_INTERFACE_MAP_ENTRY(nsINode) @@ -98,7 +98,6 @@ NS_INTERFACE_MAP_BEGIN(nsDOMAttribute) new nsNodeSupportsWeakRefTearoff(this)) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMAttr) NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(Attr) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsDOMAttribute) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsDOMAttribute, nsIDOMAttr) diff --git a/mozilla/content/base/src/nsDOMAttributeMap.cpp b/mozilla/content/base/src/nsDOMAttributeMap.cpp index b41d82284f2..f995a4b46e1 100644 --- a/mozilla/content/base/src/nsDOMAttributeMap.cpp +++ b/mozilla/content/base/src/nsDOMAttributeMap.cpp @@ -114,11 +114,10 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END // QueryInterface implementation for nsDOMAttributeMap -NS_INTERFACE_MAP_BEGIN(nsDOMAttributeMap) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMAttributeMap) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_ENTRY(nsIDOMNamedNodeMap) NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(NamedNodeMap) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsDOMAttributeMap) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMAttributeMap) diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index ecd56a7334f..0aefc6d3956 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -897,7 +897,7 @@ nsDocument::LastRelease() NS_IMPL_CYCLE_COLLECTION_CLASS(nsDocument) -NS_INTERFACE_MAP_BEGIN(nsDocument) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDocument) NS_INTERFACE_MAP_ENTRY(nsIDocument) NS_INTERFACE_MAP_ENTRY(nsIDOMDocument) NS_INTERFACE_MAP_ENTRY(nsIDOMNSDocument) @@ -922,7 +922,6 @@ NS_INTERFACE_MAP_BEGIN(nsDocument) NS_INTERFACE_MAP_ENTRY(nsIRadioGroupContainer) NS_INTERFACE_MAP_ENTRY(nsINode) NS_INTERFACE_MAP_ENTRY(nsIMutationObserver) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsDocument) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDocument) if (aIID.Equals(NS_GET_IID(nsIDOMXPathEvaluator)) || aIID.Equals(NS_GET_IID(nsIXPathEvaluatorInternal))) { diff --git a/mozilla/content/base/src/nsFrameLoader.cpp b/mozilla/content/base/src/nsFrameLoader.cpp index 31e8a425e06..af684d85b59 100644 --- a/mozilla/content/base/src/nsFrameLoader.cpp +++ b/mozilla/content/base/src/nsFrameLoader.cpp @@ -95,10 +95,9 @@ NS_IMPL_CYCLE_COLLECTION_1(nsFrameLoader, mDocShell) NS_IMPL_CYCLE_COLLECTING_ADDREF(nsFrameLoader) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsFrameLoader) -NS_INTERFACE_MAP_BEGIN(nsFrameLoader) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsFrameLoader) NS_INTERFACE_MAP_ENTRY(nsIFrameLoader) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsFrameLoader) NS_INTERFACE_MAP_END NS_IMETHODIMP diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.cpp b/mozilla/content/base/src/nsGenericDOMDataNode.cpp index ed7e78dbce3..d8a6d684ddd 100644 --- a/mozilla/content/base/src/nsGenericDOMDataNode.cpp +++ b/mozilla/content/base/src/nsGenericDOMDataNode.cpp @@ -88,7 +88,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsGenericDOMDataNode) NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN(nsGenericDOMDataNode) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGenericDOMDataNode) NS_INTERFACE_MAP_ENTRY(nsIContent) NS_INTERFACE_MAP_ENTRY(nsINode) NS_INTERFACE_MAP_ENTRY(nsPIDOMEventTarget) @@ -104,7 +104,6 @@ NS_INTERFACE_MAP_BEGIN(nsGenericDOMDataNode) new nsNodeSupportsWeakRefTearoff(this)) NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOM3Node, new nsNode3Tearoff(this)) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIContent) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsGenericDOMDataNode) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsGenericDOMDataNode, nsIContent) diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp index 91aa543647a..dea8a89c5b5 100644 --- a/mozilla/content/base/src/nsGenericElement.cpp +++ b/mozilla/content/base/src/nsGenericElement.cpp @@ -293,9 +293,8 @@ nsChildContentList::Item(PRUint32 aIndex, nsIDOMNode** aReturn) NS_IMPL_CYCLE_COLLECTION_1(nsNode3Tearoff, mContent) -NS_INTERFACE_MAP_BEGIN(nsNode3Tearoff) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsNode3Tearoff) NS_INTERFACE_MAP_ENTRY(nsIDOM3Node) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsNode3Tearoff) NS_INTERFACE_MAP_END_AGGREGATED(mContent) NS_IMPL_CYCLE_COLLECTING_ADDREF(nsNode3Tearoff) @@ -652,9 +651,8 @@ nsNodeWeakReference::QueryReferent(const nsIID& aIID, void** aInstancePtr) NS_IMPL_CYCLE_COLLECTION_1(nsNodeSupportsWeakRefTearoff, mNode) -NS_INTERFACE_MAP_BEGIN(nsNodeSupportsWeakRefTearoff) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsNodeSupportsWeakRefTearoff) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsNodeSupportsWeakRefTearoff) NS_INTERFACE_MAP_END_AGGREGATED(mNode) NS_IMPL_CYCLE_COLLECTING_ADDREF(nsNodeSupportsWeakRefTearoff) @@ -695,12 +693,11 @@ nsDOMEventRTTearoff::~nsDOMEventRTTearoff() NS_IMPL_CYCLE_COLLECTION_1(nsDOMEventRTTearoff, mContent) -NS_INTERFACE_MAP_BEGIN(nsDOMEventRTTearoff) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMEventRTTearoff) NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget) NS_INTERFACE_MAP_ENTRY(nsIDOMEventReceiver) NS_INTERFACE_MAP_ENTRY(nsIDOM3EventTarget) NS_INTERFACE_MAP_ENTRY(nsIDOMNSEventTarget) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsDOMEventRTTearoff) NS_INTERFACE_MAP_END_AGGREGATED(mContent) NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsDOMEventRTTearoff, @@ -3045,7 +3042,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsGenericElement) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN(nsGenericElement) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGenericElement) NS_INTERFACE_MAP_ENTRY(nsIContent) NS_INTERFACE_MAP_ENTRY(nsINode) NS_INTERFACE_MAP_ENTRY(nsPIDOMEventTarget) @@ -3062,7 +3059,6 @@ NS_INTERFACE_MAP_BEGIN(nsGenericElement) NS_INTERFACE_MAP_ENTRY_TEAROFF(nsISupportsWeakReference, new nsNodeSupportsWeakRefTearoff(this)) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIContent) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsGenericElement) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsGenericElement, nsIContent) diff --git a/mozilla/content/base/src/nsXMLHttpRequest.cpp b/mozilla/content/base/src/nsXMLHttpRequest.cpp index 13680a3d0fc..d4451e6a6f8 100644 --- a/mozilla/content/base/src/nsXMLHttpRequest.cpp +++ b/mozilla/content/base/src/nsXMLHttpRequest.cpp @@ -343,7 +343,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END // QueryInterface implementation for nsXMLHttpRequest -NS_INTERFACE_MAP_BEGIN(nsXMLHttpRequest) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXMLHttpRequest) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXMLHttpRequest) NS_INTERFACE_MAP_ENTRY(nsIXMLHttpRequest) NS_INTERFACE_MAP_ENTRY(nsIJSXMLHttpRequest) @@ -356,7 +356,6 @@ NS_INTERFACE_MAP_BEGIN(nsXMLHttpRequest) NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XMLHttpRequest) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsXMLHttpRequest) NS_INTERFACE_MAP_END diff --git a/mozilla/content/events/src/nsEventListenerManager.cpp b/mozilla/content/events/src/nsEventListenerManager.cpp index e757b40f5d4..6f27e4b1dd4 100644 --- a/mozilla/content/events/src/nsEventListenerManager.cpp +++ b/mozilla/content/events/src/nsEventListenerManager.cpp @@ -388,13 +388,12 @@ nsEventListenerManager::Shutdown() NS_IMPL_CYCLE_COLLECTION_CLASS(nsEventListenerManager) -NS_INTERFACE_MAP_BEGIN(nsEventListenerManager) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsEventListenerManager) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIEventListenerManager) NS_INTERFACE_MAP_ENTRY(nsIEventListenerManager) NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget) NS_INTERFACE_MAP_ENTRY(nsIDOM3EventTarget) NS_INTERFACE_MAP_ENTRY(nsIDOMEventReceiver) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsEventListenerManager) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsEventListenerManager, nsIEventListenerManager) diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp index 1e900698992..109caed0477 100644 --- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp @@ -211,10 +211,9 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsGenericHTMLElementTearoff, NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsGenericHTMLElementTearoff, nsIDOMNSHTMLElement) -NS_INTERFACE_MAP_BEGIN(nsGenericHTMLElementTearoff) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGenericHTMLElementTearoff) NS_INTERFACE_MAP_ENTRY(nsIDOMNSHTMLElement) NS_INTERFACE_MAP_ENTRY(nsIDOMElementCSSInlineStyle) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsGenericHTMLElementTearoff) NS_INTERFACE_MAP_END_AGGREGATED(mElement) @@ -2929,10 +2928,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsGenericHTMLFrameElement, NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFrameLoader) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN(nsGenericHTMLFrameElement) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsGenericHTMLFrameElement) NS_INTERFACE_MAP_ENTRY(nsIDOMNSHTMLFrameElement) NS_INTERFACE_MAP_ENTRY(nsIFrameLoaderOwner) - NS_INTERFACE_MAP_ENTRY_CYCLE_COLLECTION(nsGenericHTMLFrameElement) NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement) nsresult diff --git a/mozilla/content/html/content/src/nsHTMLFormElement.cpp b/mozilla/content/html/content/src/nsHTMLFormElement.cpp index d6780184feb..fadfb897853 100644 --- a/mozilla/content/html/content/src/nsHTMLFormElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLFormElement.cpp @@ -2001,12 +2001,11 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsFormControlList) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END // XPConnect interface list for nsFormControlList -NS_INTERFACE_MAP_BEGIN(nsFormControlList) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsFormControlList) NS_INTERFACE_MAP_ENTRY(nsIDOMNSHTMLFormControlList) NS_INTERFACE_MAP_ENTRY(nsIDOMHTMLCollection) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMHTMLCollection) NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(HTMLFormControlCollection) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsFormControlList) NS_INTERFACE_MAP_END diff --git a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp index d3f7d63394c..a9e6738f365 100644 --- a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp @@ -2247,13 +2247,12 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END // nsISupports // QueryInterface implementation for nsHTMLOptionCollection -NS_INTERFACE_MAP_BEGIN(nsHTMLOptionCollection) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsHTMLOptionCollection) NS_INTERFACE_MAP_ENTRY(nsIDOMHTMLOptionsCollection) NS_INTERFACE_MAP_ENTRY(nsIDOMNSHTMLOptionCollection) NS_INTERFACE_MAP_ENTRY(nsIDOMHTMLCollection) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMNSHTMLOptionCollection) NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(HTMLOptionsCollection) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsHTMLOptionCollection) NS_INTERFACE_MAP_END diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index 2911866e53e..b0fa8ed6f86 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -374,12 +374,11 @@ NS_IMPL_RELEASE_INHERITED(nsHTMLDocument, nsDocument) // QueryInterface implementation for nsHTMLDocument -NS_INTERFACE_MAP_BEGIN(nsHTMLDocument) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsHTMLDocument) NS_INTERFACE_MAP_ENTRY(nsIHTMLDocument) NS_INTERFACE_MAP_ENTRY(nsIDOMHTMLDocument) NS_INTERFACE_MAP_ENTRY(nsIDOMNSHTMLDocument) NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(HTMLDocument) - NS_INTERFACE_MAP_ENTRY_CYCLE_COLLECTION(nsHTMLDocument) NS_INTERFACE_MAP_END_INHERITING(nsDocument) diff --git a/mozilla/content/xbl/src/nsBindingManager.cpp b/mozilla/content/xbl/src/nsBindingManager.cpp index 870e1339878..20a017d00bc 100644 --- a/mozilla/content/xbl/src/nsBindingManager.cpp +++ b/mozilla/content/xbl/src/nsBindingManager.cpp @@ -346,10 +346,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_CLASS(nsBindingManager) -NS_INTERFACE_MAP_BEGIN(nsBindingManager) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsBindingManager) NS_INTERFACE_MAP_ENTRY(nsIMutationObserver) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsBindingManager) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsBindingManager) diff --git a/mozilla/content/xbl/src/nsXBLDocumentInfo.cpp b/mozilla/content/xbl/src/nsXBLDocumentInfo.cpp index 19748d3a5fe..c9d605f7e08 100644 --- a/mozilla/content/xbl/src/nsXBLDocumentInfo.cpp +++ b/mozilla/content/xbl/src/nsXBLDocumentInfo.cpp @@ -212,11 +212,10 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXBLDocGlobalObject) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mScriptContext) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN(nsXBLDocGlobalObject) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXBLDocGlobalObject) NS_INTERFACE_MAP_ENTRY(nsIScriptGlobalObject) NS_INTERFACE_MAP_ENTRY(nsIScriptObjectPrincipal) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIScriptGlobalObject) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsXBLDocGlobalObject) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXBLDocGlobalObject, nsIScriptGlobalObject) @@ -466,12 +465,11 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXBLDocumentInfo) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mGlobalObject) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN(nsXBLDocumentInfo) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXBLDocumentInfo) NS_INTERFACE_MAP_ENTRY(nsIXBLDocumentInfo) NS_INTERFACE_MAP_ENTRY(nsIScriptGlobalObjectOwner) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXBLDocumentInfo) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsXBLDocumentInfo) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXBLDocumentInfo, nsIXBLDocumentInfo) diff --git a/mozilla/content/xbl/src/nsXBLResourceLoader.cpp b/mozilla/content/xbl/src/nsXBLResourceLoader.cpp index 2bbab6b0a89..6f1e7d0f77a 100644 --- a/mozilla/content/xbl/src/nsXBLResourceLoader.cpp +++ b/mozilla/content/xbl/src/nsXBLResourceLoader.cpp @@ -65,10 +65,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXBLResourceLoader) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMARRAY(mBoundElements) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN(nsXBLResourceLoader) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXBLResourceLoader) NS_INTERFACE_MAP_ENTRY(nsICSSLoaderObserver) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsXBLResourceLoader) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXBLResourceLoader) diff --git a/mozilla/content/xml/document/src/nsXMLDocument.cpp b/mozilla/content/xml/document/src/nsXMLDocument.cpp index 3dc9bbf7873..7e85cbab3e8 100644 --- a/mozilla/content/xml/document/src/nsXMLDocument.cpp +++ b/mozilla/content/xml/document/src/nsXMLDocument.cpp @@ -198,12 +198,11 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsXMLDocument, nsDocument) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END // QueryInterface implementation for nsXMLDocument -NS_INTERFACE_MAP_BEGIN(nsXMLDocument) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsXMLDocument) NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor) NS_INTERFACE_MAP_ENTRY(nsIChannelEventSink) NS_INTERFACE_MAP_ENTRY(nsIDOMXMLDocument) NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XMLDocument) - NS_INTERFACE_MAP_ENTRY_CYCLE_COLLECTION(nsXMLDocument) NS_INTERFACE_MAP_END_INHERITING(nsDocument) diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp index 0440c93aea3..476b37a7dec 100644 --- a/mozilla/content/xul/content/src/nsXULElement.cpp +++ b/mozilla/content/xul/content/src/nsXULElement.cpp @@ -649,9 +649,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsScriptEventHandlerOwnerTearoff) cb.NoteXPCOMChild(NS_STATIC_CAST(nsIContent*, tmp->mElement)); NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN(nsScriptEventHandlerOwnerTearoff) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsScriptEventHandlerOwnerTearoff) NS_INTERFACE_MAP_ENTRY(nsIScriptEventHandlerOwner) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsScriptEventHandlerOwnerTearoff) NS_INTERFACE_MAP_END_AGGREGATED(mElement) NS_IMPL_CYCLE_COLLECTING_ADDREF(nsScriptEventHandlerOwnerTearoff) diff --git a/mozilla/content/xul/document/src/nsXULCommandDispatcher.cpp b/mozilla/content/xul/document/src/nsXULCommandDispatcher.cpp index 0bbca2e873e..6cde711254e 100644 --- a/mozilla/content/xul/document/src/nsXULCommandDispatcher.cpp +++ b/mozilla/content/xul/document/src/nsXULCommandDispatcher.cpp @@ -94,12 +94,11 @@ nsXULCommandDispatcher::~nsXULCommandDispatcher() NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULCommandDispatcher) // QueryInterface implementation for nsXULCommandDispatcher -NS_INTERFACE_MAP_BEGIN(nsXULCommandDispatcher) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULCommandDispatcher) NS_INTERFACE_MAP_ENTRY(nsIDOMXULCommandDispatcher) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMXULCommandDispatcher) NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XULCommandDispatcher) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsXULCommandDispatcher) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXULCommandDispatcher) diff --git a/mozilla/content/xul/document/src/nsXULControllers.cpp b/mozilla/content/xul/document/src/nsXULControllers.cpp index 56ea10739c6..26029da249c 100644 --- a/mozilla/content/xul/document/src/nsXULControllers.cpp +++ b/mozilla/content/xul/document/src/nsXULControllers.cpp @@ -114,12 +114,11 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXULControllers) } NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN(nsXULControllers) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULControllers) NS_INTERFACE_MAP_ENTRY(nsIControllers) NS_INTERFACE_MAP_ENTRY(nsISecurityCheckedComponent) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIControllers) NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XULControllers) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsXULControllers) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXULControllers, nsIControllers) diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index dd1c44f54d6..89793f622b9 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULDocument.cpp @@ -363,13 +363,12 @@ NS_IMPL_RELEASE_INHERITED(nsXULDocument, nsXMLDocument) // QueryInterface implementation for nsXULDocument -NS_INTERFACE_MAP_BEGIN(nsXULDocument) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsXULDocument) NS_INTERFACE_MAP_ENTRY(nsIXULDocument) NS_INTERFACE_MAP_ENTRY(nsIDOMXULDocument) NS_INTERFACE_MAP_ENTRY(nsIStreamLoaderObserver) NS_INTERFACE_MAP_ENTRY(nsICSSLoaderObserver) NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XULDocument) - NS_INTERFACE_MAP_ENTRY_CYCLE_COLLECTION(nsXULDocument) NS_INTERFACE_MAP_END_INHERITING(nsXMLDocument) diff --git a/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp b/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp index f351a5a61f3..86d7de34f3b 100644 --- a/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp @@ -200,11 +200,10 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXULPrototypeDocument) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mGlobalObject) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN(nsXULPrototypeDocument) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULPrototypeDocument) NS_INTERFACE_MAP_ENTRY(nsIScriptGlobalObjectOwner) NS_INTERFACE_MAP_ENTRY(nsISerializable) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIScriptGlobalObjectOwner) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsXULPrototypeDocument) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXULPrototypeDocument, @@ -630,11 +629,10 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXULPDGlobalObject) } NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN(nsXULPDGlobalObject) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULPDGlobalObject) NS_INTERFACE_MAP_ENTRY(nsIScriptGlobalObject) NS_INTERFACE_MAP_ENTRY(nsIScriptObjectPrincipal) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIScriptGlobalObject) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsXULPDGlobalObject) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXULPDGlobalObject, diff --git a/mozilla/content/xul/templates/src/nsRDFQuery.cpp b/mozilla/content/xul/templates/src/nsRDFQuery.cpp index d3c726561a3..69ba5af5fd6 100755 --- a/mozilla/content/xul/templates/src/nsRDFQuery.cpp +++ b/mozilla/content/xul/templates/src/nsRDFQuery.cpp @@ -42,10 +42,9 @@ NS_IMPL_CYCLE_COLLECTION_1(nsRDFQuery, mQueryNode) -NS_INTERFACE_MAP_BEGIN(nsRDFQuery) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsRDFQuery) NS_INTERFACE_MAP_ENTRY(nsITemplateRDFQuery) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsRDFQuery) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsRDFQuery) diff --git a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp index dd485868c62..2af50738466 100644 --- a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp +++ b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp @@ -281,13 +281,12 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXULTemplateBuilder, NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsXULTemplateBuilder, nsIXULTemplateBuilder) -NS_INTERFACE_MAP_BEGIN(nsXULTemplateBuilder) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULTemplateBuilder) NS_INTERFACE_MAP_ENTRY(nsIXULTemplateBuilder) NS_INTERFACE_MAP_ENTRY(nsIDocumentObserver) NS_INTERFACE_MAP_ENTRY(nsIMutationObserver) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXULTemplateBuilder) NS_INTERFACE_MAP_ENTRY_DOM_CLASSINFO(XULTemplateBuilder) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsXULTemplateBuilder) NS_INTERFACE_MAP_END //---------------------------------------------------------------------- diff --git a/mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp b/mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp index 02ba57e9ba7..551f54c680a 100755 --- a/mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp +++ b/mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp @@ -149,11 +149,10 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXULTemplateQueryProcessorRDF, nsIXULTemplateQueryProcessor) NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsXULTemplateQueryProcessorRDF, nsIXULTemplateQueryProcessor) -NS_INTERFACE_MAP_BEGIN(nsXULTemplateQueryProcessorRDF) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULTemplateQueryProcessorRDF) NS_INTERFACE_MAP_ENTRY(nsIXULTemplateQueryProcessor) NS_INTERFACE_MAP_ENTRY(nsIRDFObserver) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXULTemplateQueryProcessor) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsXULTemplateQueryProcessorRDF) NS_INTERFACE_MAP_END nsXULTemplateQueryProcessorRDF::nsXULTemplateQueryProcessorRDF(void) diff --git a/mozilla/content/xul/templates/src/nsXULTemplateResultRDF.cpp b/mozilla/content/xul/templates/src/nsXULTemplateResultRDF.cpp index bd928ad591b..c329773a633 100755 --- a/mozilla/content/xul/templates/src/nsXULTemplateResultRDF.cpp +++ b/mozilla/content/xul/templates/src/nsXULTemplateResultRDF.cpp @@ -42,10 +42,9 @@ NS_IMPL_CYCLE_COLLECTION_1(nsXULTemplateResultRDF, mQuery) -NS_INTERFACE_MAP_BEGIN(nsXULTemplateResultRDF) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULTemplateResultRDF) NS_INTERFACE_MAP_ENTRY(nsIXULTemplateResult) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsXULTemplateResultRDF) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXULTemplateResultRDF) diff --git a/mozilla/dom/src/base/nsFocusController.cpp b/mozilla/dom/src/base/nsFocusController.cpp index 1445a152ac5..40ac0154942 100644 --- a/mozilla/dom/src/base/nsFocusController.cpp +++ b/mozilla/dom/src/base/nsFocusController.cpp @@ -91,13 +91,12 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsFocusController, nsIFocusController) NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsFocusController, nsIFocusController) -NS_INTERFACE_MAP_BEGIN(nsFocusController) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsFocusController) NS_INTERFACE_MAP_ENTRY(nsIFocusController) NS_INTERFACE_MAP_ENTRY(nsIDOMFocusListener) NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener) NS_INTERFACE_MAP_ENTRY(nsSupportsWeakReference) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIFocusController) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsFocusController) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTION_UNLINK_0(nsFocusController) diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp index 429c02c7582..7943d966c8a 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.cpp +++ b/mozilla/dom/src/base/nsGlobalWindow.cpp @@ -688,7 +688,7 @@ nsGlobalWindow::FreeInnerObjects(PRBool aClearScope) NS_IMPL_CYCLE_COLLECTION_CLASS(nsGlobalWindow) // QueryInterface implementation for nsGlobalWindow -NS_INTERFACE_MAP_BEGIN(nsGlobalWindow) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGlobalWindow) // Make sure this matches the cast in nsGlobalWindow::FromWrapper() NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIScriptGlobalObject) NS_INTERFACE_MAP_ENTRY(nsIDOMWindowInternal) @@ -708,7 +708,6 @@ NS_INTERFACE_MAP_BEGIN(nsGlobalWindow) NS_INTERFACE_MAP_ENTRY(nsIDOMStorageWindow) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsGlobalWindow) NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Window) NS_INTERFACE_MAP_END @@ -7627,10 +7626,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsGlobalChromeWindow, NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END // QueryInterface implementation for nsGlobalChromeWindow -NS_INTERFACE_MAP_BEGIN(nsGlobalChromeWindow) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsGlobalChromeWindow) NS_INTERFACE_MAP_ENTRY(nsIDOMChromeWindow) NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ChromeWindow) - NS_INTERFACE_MAP_ENTRY_CYCLE_COLLECTION(nsGlobalChromeWindow) NS_INTERFACE_MAP_END_INHERITING(nsGlobalWindow) NS_IMPL_ADDREF_INHERITED(nsGlobalChromeWindow, nsGlobalWindow) diff --git a/mozilla/dom/src/base/nsJSEnvironment.cpp b/mozilla/dom/src/base/nsJSEnvironment.cpp index 4c599bfc2a5..5904266ad20 100644 --- a/mozilla/dom/src/base/nsJSEnvironment.cpp +++ b/mozilla/dom/src/base/nsJSEnvironment.cpp @@ -1034,12 +1034,11 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsJSContext) cb.NoteScriptChild(JAVASCRIPT, ::JS_GetGlobalObject(tmp->mContext)); NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN(nsJSContext) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsJSContext) NS_INTERFACE_MAP_ENTRY(nsIScriptContext) NS_INTERFACE_MAP_ENTRY(nsIXPCScriptNotify) NS_INTERFACE_MAP_ENTRY(nsITimerCallback) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIScriptContext) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsJSContext) NS_INTERFACE_MAP_END @@ -3655,11 +3654,10 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsJSArgArray) } NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN(nsJSArgArray) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsJSArgArray) NS_INTERFACE_MAP_ENTRY(nsIArray) NS_INTERFACE_MAP_ENTRY(nsIJSArgArray) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIJSArgArray) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsJSArgArray) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsJSArgArray, nsIJSArgArray) diff --git a/mozilla/dom/src/base/nsJSTimeoutHandler.cpp b/mozilla/dom/src/base/nsJSTimeoutHandler.cpp index 3028b2c7efe..4543f0b565f 100644 --- a/mozilla/dom/src/base/nsJSTimeoutHandler.cpp +++ b/mozilla/dom/src/base/nsJSTimeoutHandler.cpp @@ -121,10 +121,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsJSScriptTimeoutHandler) cb.NoteScriptChild(nsIProgrammingLanguage::JAVASCRIPT, tmp->mFunObj); NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN(nsJSScriptTimeoutHandler) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsJSScriptTimeoutHandler) NS_INTERFACE_MAP_ENTRY(nsIScriptTimeoutHandler) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsJSScriptTimeoutHandler) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsJSScriptTimeoutHandler) diff --git a/mozilla/dom/src/base/nsWindowRoot.cpp b/mozilla/dom/src/base/nsWindowRoot.cpp index e105886c451..46cd2464dfa 100644 --- a/mozilla/dom/src/base/nsWindowRoot.cpp +++ b/mozilla/dom/src/base/nsWindowRoot.cpp @@ -82,7 +82,7 @@ nsWindowRoot::~nsWindowRoot() NS_IMPL_CYCLE_COLLECTION_2(nsWindowRoot, mListenerManager, mFocusController) -NS_INTERFACE_MAP_BEGIN(nsWindowRoot) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsWindowRoot) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMEventReceiver) NS_INTERFACE_MAP_ENTRY(nsIDOMEventReceiver) NS_INTERFACE_MAP_ENTRY(nsPIDOMEventTarget) @@ -90,7 +90,6 @@ NS_INTERFACE_MAP_BEGIN(nsWindowRoot) NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget) NS_INTERFACE_MAP_ENTRY(nsIDOM3EventTarget) NS_INTERFACE_MAP_ENTRY(nsIDOMNSEventTarget) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsWindowRoot) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsWindowRoot, nsIDOMEventReceiver) diff --git a/mozilla/dom/src/events/nsJSEventListener.cpp b/mozilla/dom/src/events/nsJSEventListener.cpp index e9556f5e9af..b02dbdf6835 100644 --- a/mozilla/dom/src/events/nsJSEventListener.cpp +++ b/mozilla/dom/src/events/nsJSEventListener.cpp @@ -97,11 +97,10 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsJSEventListener) cb.NoteScriptChild(nsIProgrammingLanguage::JAVASCRIPT, tmp->mScopeObject); NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_INTERFACE_MAP_BEGIN(nsJSEventListener) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsJSEventListener) NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener) NS_INTERFACE_MAP_ENTRY(nsIJSEventListener) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMEventListener) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsJSEventListener) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsJSEventListener, nsIDOMEventListener) diff --git a/mozilla/embedding/components/commandhandler/src/nsCommandManager.cpp b/mozilla/embedding/components/commandhandler/src/nsCommandManager.cpp index e3cac98d70e..368f2107186 100644 --- a/mozilla/embedding/components/commandhandler/src/nsCommandManager.cpp +++ b/mozilla/embedding/components/commandhandler/src/nsCommandManager.cpp @@ -96,12 +96,11 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsCommandManager, nsICommandManager) NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsCommandManager, nsICommandManager) -NS_INTERFACE_MAP_BEGIN(nsCommandManager) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCommandManager) NS_INTERFACE_MAP_ENTRY(nsICommandManager) NS_INTERFACE_MAP_ENTRY(nsPICommandUpdater) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsICommandManager) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsCommandManager) NS_INTERFACE_MAP_END #if 0 diff --git a/mozilla/js/src/xpconnect/src/xpcvariant.cpp b/mozilla/js/src/xpconnect/src/xpcvariant.cpp index 3b437dc02f0..6f85ac55e82 100644 --- a/mozilla/js/src/xpconnect/src/xpcvariant.cpp +++ b/mozilla/js/src/xpconnect/src/xpcvariant.cpp @@ -44,12 +44,11 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(XPCVariant) -NS_INTERFACE_MAP_BEGIN(XPCVariant) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(XPCVariant) NS_INTERFACE_MAP_ENTRY(XPCVariant) NS_INTERFACE_MAP_ENTRY(nsIVariant) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_IMPL_QUERY_CLASSINFO(XPCVariant) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(XPCVariant) NS_INTERFACE_MAP_END NS_IMPL_CI_INTERFACE_GETTER2(XPCVariant, XPCVariant, nsIVariant) diff --git a/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp b/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp index 62dd0a6a0d8..786e1eec029 100644 --- a/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp +++ b/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp @@ -902,11 +902,10 @@ XPCWrappedNative::Init(XPCCallContext& ccx, JSObject* parent, JSBool isGlobal, } -NS_INTERFACE_MAP_BEGIN(XPCWrappedNative) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(XPCWrappedNative) NS_INTERFACE_MAP_ENTRY(nsIXPConnectWrappedNative) NS_INTERFACE_MAP_ENTRY(nsIXPConnectJSObjectHolder) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXPConnectWrappedNative) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(XPCWrappedNative) NS_INTERFACE_MAP_END_THREADSAFE NS_IMPL_THREADSAFE_ADDREF(XPCWrappedNative) diff --git a/mozilla/rdf/base/src/nsCompositeDataSource.cpp b/mozilla/rdf/base/src/nsCompositeDataSource.cpp index bd991adfb93..f81da8e186c 100644 --- a/mozilla/rdf/base/src/nsCompositeDataSource.cpp +++ b/mozilla/rdf/base/src/nsCompositeDataSource.cpp @@ -669,13 +669,12 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(CompositeDataSourceImpl, NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(CompositeDataSourceImpl, nsIRDFCompositeDataSource) -NS_INTERFACE_MAP_BEGIN(CompositeDataSourceImpl) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CompositeDataSourceImpl) NS_INTERFACE_MAP_ENTRY(nsIRDFCompositeDataSource) NS_INTERFACE_MAP_ENTRY(nsIRDFDataSource) NS_INTERFACE_MAP_ENTRY(nsIRDFObserver) NS_INTERFACE_MAP_ENTRY(nsIRDFCompositeDataSource) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIRDFCompositeDataSource) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(CompositeDataSourceImpl) NS_INTERFACE_MAP_END diff --git a/mozilla/rdf/base/src/nsInMemoryDataSource.cpp b/mozilla/rdf/base/src/nsInMemoryDataSource.cpp index 5a489e10286..7e3e85a0382 100644 --- a/mozilla/rdf/base/src/nsInMemoryDataSource.cpp +++ b/mozilla/rdf/base/src/nsInMemoryDataSource.cpp @@ -985,12 +985,12 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTING_AGGREGATED(InMemoryDataSource) NS_INTERFACE_MAP_BEGIN_AGGREGATED(InMemoryDataSource) + NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION_AGGREGATED(InMemoryDataSource) NS_INTERFACE_MAP_ENTRY(nsIRDFDataSource) NS_INTERFACE_MAP_ENTRY(nsIRDFInMemoryDataSource) NS_INTERFACE_MAP_ENTRY(nsIRDFPropagatableDataSource) NS_INTERFACE_MAP_ENTRY(nsIRDFPurgeableDataSource) NS_INTERFACE_MAP_ENTRY(rdfIDataSource) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION_AGGREGATED(InMemoryDataSource) NS_INTERFACE_MAP_END //////////////////////////////////////////////////////////////////////// diff --git a/mozilla/rdf/base/src/nsRDFXMLDataSource.cpp b/mozilla/rdf/base/src/nsRDFXMLDataSource.cpp index 13dc69ce428..7cc86ec035b 100644 --- a/mozilla/rdf/base/src/nsRDFXMLDataSource.cpp +++ b/mozilla/rdf/base/src/nsRDFXMLDataSource.cpp @@ -473,7 +473,7 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(RDFXMLDataSourceImpl, NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(RDFXMLDataSourceImpl, nsIRDFDataSource) -NS_INTERFACE_MAP_BEGIN(RDFXMLDataSourceImpl) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(RDFXMLDataSourceImpl) NS_INTERFACE_MAP_ENTRY(nsIRDFDataSource) NS_INTERFACE_MAP_ENTRY(nsIRDFRemoteDataSource) NS_INTERFACE_MAP_ENTRY(nsIRDFXMLSink) @@ -482,7 +482,6 @@ NS_INTERFACE_MAP_BEGIN(RDFXMLDataSourceImpl) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) NS_INTERFACE_MAP_ENTRY(rdfIDataSource) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIRDFDataSource) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(RDFXMLDataSourceImpl) NS_INTERFACE_MAP_END diff --git a/mozilla/rdf/chrome/src/nsChromeUIDataSource.cpp b/mozilla/rdf/chrome/src/nsChromeUIDataSource.cpp index 42aaab5cef4..e1899a627ee 100644 --- a/mozilla/rdf/chrome/src/nsChromeUIDataSource.cpp +++ b/mozilla/rdf/chrome/src/nsChromeUIDataSource.cpp @@ -98,11 +98,10 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsChromeUIDataSource, NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsChromeUIDataSource, nsIRDFDataSource) -NS_INTERFACE_MAP_BEGIN(nsChromeUIDataSource) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsChromeUIDataSource) NS_INTERFACE_MAP_ENTRY(nsIRDFDataSource) NS_INTERFACE_MAP_ENTRY(nsIRDFObserver) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIRDFDataSource) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsChromeUIDataSource) NS_INTERFACE_MAP_END //---------------------------------------------------------------------- diff --git a/mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp b/mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp index 9a1294f539e..1e62320e70b 100644 --- a/mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp +++ b/mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp @@ -1598,11 +1598,10 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsDownloadsDataSource, NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsDownloadsDataSource, nsIRDFDataSource) -NS_INTERFACE_MAP_BEGIN(nsDownloadsDataSource) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDownloadsDataSource) NS_INTERFACE_MAP_ENTRY(nsIRDFDataSource) NS_INTERFACE_MAP_ENTRY(nsIRDFRemoteDataSource) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIRDFDataSource) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsDownloadsDataSource) NS_INTERFACE_MAP_END nsresult diff --git a/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp b/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp index defabc61bec..5caeb445dc1 100644 --- a/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp +++ b/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp @@ -559,7 +559,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsGlobalHistory, nsIBrowserHistory) NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsGlobalHistory, nsIBrowserHistory) -NS_INTERFACE_MAP_BEGIN(nsGlobalHistory) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGlobalHistory) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIGlobalHistory2, nsIGlobalHistory3) NS_INTERFACE_MAP_ENTRY(nsIGlobalHistory3) NS_INTERFACE_MAP_ENTRY(nsIBrowserHistory) @@ -569,7 +569,6 @@ NS_INTERFACE_MAP_BEGIN(nsGlobalHistory) NS_INTERFACE_MAP_ENTRY(nsIRDFRemoteDataSource) NS_INTERFACE_MAP_ENTRY(nsIAutoCompleteSearch) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIBrowserHistory) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsGlobalHistory) NS_INTERFACE_MAP_END //---------------------------------------------------------------------- diff --git a/mozilla/xpcom/base/nsCycleCollectionParticipant.h b/mozilla/xpcom/base/nsCycleCollectionParticipant.h index 37d387b50c3..cfd5cbe57ff 100644 --- a/mozilla/xpcom/base/nsCycleCollectionParticipant.h +++ b/mozilla/xpcom/base/nsCycleCollectionParticipant.h @@ -150,6 +150,14 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsCycleCollectionParticipant, NS_INTERFACE_MAP_ENTRY_CYCLE_COLLECTION(_class) \ NS_INTERFACE_MAP_ENTRY_CYCLE_COLLECTION_ISUPPORTS(_class) +#define NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(_class) \ + NS_INTERFACE_MAP_BEGIN(_class) \ + NS_INTERFACE_MAP_ENTRY_CYCLE_COLLECTION(_class) \ + NS_INTERFACE_MAP_ENTRY_CYCLE_COLLECTION_ISUPPORTS(_class) + +#define NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(_class) \ + NS_INTERFACE_MAP_BEGIN(_class) \ + NS_INTERFACE_MAP_ENTRY_CYCLE_COLLECTION(_class) /////////////////////////////////////////////////////////////////////////////// // Helpers for implementing nsCycleCollectionParticipant::Unlink diff --git a/mozilla/xpfe/components/intl/nsCharsetMenu.cpp b/mozilla/xpfe/components/intl/nsCharsetMenu.cpp index 8581d6808d2..a03e95687f4 100644 --- a/mozilla/xpfe/components/intl/nsCharsetMenu.cpp +++ b/mozilla/xpfe/components/intl/nsCharsetMenu.cpp @@ -475,11 +475,10 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsCharsetMenu, nsIRDFDataSource) NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsCharsetMenu, nsIRDFDataSource) -NS_INTERFACE_MAP_BEGIN(nsCharsetMenu) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCharsetMenu) NS_INTERFACE_MAP_ENTRY(nsIRDFDataSource) NS_INTERFACE_MAP_ENTRY(nsICurrentCharsetListener) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIRDFDataSource) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsCharsetMenu) NS_INTERFACE_MAP_END nsIRDFDataSource * nsCharsetMenu::mInner = NULL; diff --git a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp index e8c336cdcf8..27c4e1e895a 100644 --- a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp +++ b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp @@ -669,11 +669,10 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(RelatedLinksHandlerImpl, NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(RelatedLinksHandlerImpl, nsIRelatedLinksHandler) -NS_INTERFACE_MAP_BEGIN(RelatedLinksHandlerImpl) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(RelatedLinksHandlerImpl) NS_INTERFACE_MAP_ENTRY(nsIRelatedLinksHandler) NS_INTERFACE_MAP_ENTRY(nsIRDFDataSource) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIRelatedLinksHandler) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(RelatedLinksHandlerImpl) NS_INTERFACE_MAP_END // nsIRelatedLinksHandler interface diff --git a/mozilla/xpfe/components/windowds/nsWindowDataSource.cpp b/mozilla/xpfe/components/windowds/nsWindowDataSource.cpp index f8721d3b358..e35347a1c83 100644 --- a/mozilla/xpfe/components/windowds/nsWindowDataSource.cpp +++ b/mozilla/xpfe/components/windowds/nsWindowDataSource.cpp @@ -141,13 +141,12 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsWindowDataSource, NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsWindowDataSource, nsIObserver) -NS_INTERFACE_MAP_BEGIN(nsWindowDataSource) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsWindowDataSource) NS_INTERFACE_MAP_ENTRY(nsIObserver) NS_INTERFACE_MAP_ENTRY(nsIWindowMediatorListener) NS_INTERFACE_MAP_ENTRY(nsIWindowDataSource) NS_INTERFACE_MAP_ENTRY(nsIRDFDataSource) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIObserver) - NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsWindowDataSource) NS_INTERFACE_MAP_END // nsIWindowMediatorListener implementation