Fix for bug 533637 (Speed up unwrapping a node in quickstubs that use nsINode (dromaeo)). Pair every DOMCI to a specific C++ class. r=jst.

--HG--
extra : rebase_source : 9a7823b365cfca04bb08c5be94eab29d218f1e61

content/base/src/nsCommentNode.cpp

@@ -106,6 +106,7 @@ nsCommentNode::~nsCommentNode()
 {
 }
 
+DOMCI_DATA(Comment, nsCommentNode)
 
 // QueryInterface implementation for nsCommentNode
 NS_INTERFACE_TABLE_HEAD(nsCommentNode)

content/base/src/nsContentList.cpp

@@ -83,6 +83,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
     NS_INTERFACE_TABLE_ENTRY(_class, nsINodeList)                             \
     NS_INTERFACE_TABLE_ENTRY(_class, nsIDOMNodeList)
 
+DOMCI_DATA(NodeList, nsBaseContentList)
 
 // QueryInterface implementation for nsBaseContentList
 NS_INTERFACE_TABLE_HEAD(nsBaseContentList)
@@ -440,6 +441,7 @@ nsContentList::~nsContentList()
   }
 }
 
+DOMCI_DATA(ContentList, nsContentList)
 
 // QueryInterface implementation for nsContentList
 NS_INTERFACE_TABLE_HEAD(nsContentList)

content/base/src/nsDOMAttribute.cpp

@@ -109,6 +109,9 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDOMAttribute)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_LISTENERMANAGER
   NS_IMPL_CYCLE_COLLECTION_UNLINK_USERDATA
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+DOMCI_DATA(Attr, nsDOMAttribute)
+
 // QueryInterface implementation for nsDOMAttribute
 NS_INTERFACE_TABLE_HEAD(nsDOMAttribute)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY

content/base/src/nsDOMAttributeMap.cpp

@@ -115,6 +115,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsDOMAttributeMap)
   tmp->mAttributeCache.Enumerate(TraverseMapEntry, &cb);
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
+DOMCI_DATA(NamedNodeMap, nsDOMAttributeMap)
 
 // QueryInterface implementation for nsDOMAttributeMap
 NS_INTERFACE_TABLE_HEAD(nsDOMAttributeMap)

content/base/src/nsDOMDocumentType.cpp

@@ -121,6 +121,7 @@ nsDOMDocumentType::~nsDOMDocumentType()
 {
 }
 
+DOMCI_DATA(DocumentType, nsDOMDocumentType)
 
 // QueryInterface implementation for nsDOMDocumentType
 NS_INTERFACE_TABLE_HEAD(nsDOMDocumentType)

content/base/src/nsDOMFile.cpp

@@ -67,6 +67,8 @@
 
 // nsDOMFile implementation
 
+DOMCI_DATA(File, nsDOMFile)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMFile)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFile)
   NS_INTERFACE_MAP_ENTRY(nsIDOMFile)
@@ -463,6 +465,8 @@ nsDOMFile::ConvertStream(nsIInputStream *aStream,
 
 // nsDOMFileList implementation
 
+DOMCI_DATA(FileList, nsDOMFileList)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMFileList)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFileList)
   NS_INTERFACE_MAP_ENTRY(nsIDOMFileList)
@@ -490,6 +494,8 @@ nsDOMFileList::Item(PRUint32 aIndex, nsIDOMFile **aFile)
 
 // nsDOMFileError implementation
 
+DOMCI_DATA(FileError, nsDOMFileError)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMFileError)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFileError)
   NS_INTERFACE_MAP_ENTRY(nsIDOMFileError)

content/base/src/nsDOMFileReader.cpp

@@ -109,6 +109,8 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsDOMFileReader,
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mChannel)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
+DOMCI_DATA(FileReader, nsDOMFileReader)
+
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMFileReader)
   NS_INTERFACE_MAP_ENTRY(nsIDOMFileReader)
   NS_INTERFACE_MAP_ENTRY(nsIStreamListener)

content/base/src/nsDOMLists.cpp

@@ -56,6 +56,8 @@ nsDOMStringList::~nsDOMStringList()
 {
 }
 
+DOMCI_DATA(DOMStringList, nsDOMStringList)
+
 NS_IMPL_ADDREF(nsDOMStringList)
 NS_IMPL_RELEASE(nsDOMStringList)
 NS_INTERFACE_TABLE_HEAD(nsDOMStringList)
@@ -102,6 +104,7 @@ nsNameList::nsNameList()
 nsNameList::~nsNameList()
 {
 }
+DOMCI_DATA(NameList, nsNameList)
 
 NS_IMPL_ADDREF(nsNameList)
 NS_IMPL_RELEASE(nsNameList)

content/base/src/nsDOMParser.cpp

@@ -116,6 +116,7 @@ nsDOMParser::~nsDOMParser()
   mLoopingForSyncLoad = PR_FALSE;
 }
 
+DOMCI_DATA(DOMParser, nsDOMParser)
 
 // QueryInterface implementation for nsDOMParser
 NS_INTERFACE_MAP_BEGIN(nsDOMParser)

content/base/src/nsDOMSerializer.cpp

@@ -58,6 +58,7 @@ nsDOMSerializer::~nsDOMSerializer()
 {
 }
 
+DOMCI_DATA(XMLSerializer, nsDOMSerializer)
 
 // QueryInterface implementation for nsDOMSerializer
 NS_INTERFACE_MAP_BEGIN(nsDOMSerializer)

content/base/src/nsDOMTokenList.cpp

@@ -57,6 +57,8 @@ nsDOMTokenList::nsDOMTokenList(nsGenericElement *aElement, nsIAtom* aAttrAtom)
 
 nsDOMTokenList::~nsDOMTokenList() { }
 
+DOMCI_DATA(DOMTokenList, nsDOMTokenList)
+
 NS_INTERFACE_TABLE_HEAD(nsDOMTokenList)
   NS_INTERFACE_TABLE1(nsDOMTokenList,
                       nsIDOMDOMTokenList)

content/base/src/nsDocument.cpp

@@ -477,6 +477,8 @@ nsDOMStyleSheetList::~nsDOMStyleSheetList()
   }
 }
 
+DOMCI_DATA(StyleSheetList, nsDOMStyleSheetList)
+
 // XXX couldn't we use the GetIIDs method from CSSStyleSheetList here?
 // QueryInterface implementation for nsDOMStyleSheetList
 NS_INTERFACE_TABLE_HEAD(nsDOMStyleSheetList)
@@ -1269,6 +1271,8 @@ nsDOMImplementation::~nsDOMImplementation()
 {
 }
 
+DOMCI_DATA(DOMImplementation, nsDOMImplementation)
+
 // QueryInterface implementation for nsDOMImplementation
 NS_INTERFACE_MAP_BEGIN(nsDOMImplementation)
   NS_INTERFACE_MAP_ENTRY(nsIDOMDOMImplementation)

content/base/src/nsDocumentFragment.cpp

@@ -194,6 +194,8 @@ nsDocumentFragment::IsNodeOfType(PRUint32 aFlags) const
   return !(aFlags & ~(eCONTENT | eDOCUMENT_FRAGMENT));
 }
 
+DOMCI_DATA(DocumentFragment, nsDocumentFragment)
+
 // QueryInterface implementation for nsDocumentFragment
 NS_INTERFACE_TABLE_HEAD(nsDocumentFragment)
   NS_NODE_INTERFACE_TABLE2(nsDocumentFragment, nsIDOMNode,

content/base/src/nsFormData.cpp

@@ -49,6 +49,8 @@ nsFormData::nsFormData()
 // -------------------------------------------------------------------------
 // nsISupports
 
+DOMCI_DATA(FormData, nsFormData)
+
 NS_IMPL_ADDREF(nsFormData)
 NS_IMPL_RELEASE(nsFormData)
 NS_INTERFACE_MAP_BEGIN(nsFormData)

content/base/src/nsNodeIterator.cpp

@@ -231,6 +231,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsNodeIterator)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFilter)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
+DOMCI_DATA(NodeIterator, nsNodeIterator)
+
 // QueryInterface implementation for nsNodeIterator
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsNodeIterator)
     NS_INTERFACE_MAP_ENTRY(nsIDOMNodeIterator)

content/base/src/nsRange.cpp

@@ -238,6 +238,8 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(nsRange)
 NS_IMPL_CYCLE_COLLECTING_ADDREF(nsRange)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(nsRange)
 
+DOMCI_DATA(Range, nsRange)
+
 // QueryInterface implementation for nsRange
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsRange)
   NS_INTERFACE_MAP_ENTRY(nsIDOMRange)

content/base/src/nsTextNode.cpp

@@ -151,6 +151,7 @@ nsTextNode::~nsTextNode()
 NS_IMPL_ADDREF_INHERITED(nsTextNode, nsGenericDOMDataNode)
 NS_IMPL_RELEASE_INHERITED(nsTextNode, nsGenericDOMDataNode)
 
+DOMCI_DATA(Text, nsTextNode)
 
 // QueryInterface implementation for nsTextNode
 NS_INTERFACE_TABLE_HEAD(nsTextNode)

content/base/src/nsTreeWalker.cpp

@@ -77,6 +77,8 @@ nsTreeWalker::~nsTreeWalker()
 
 NS_IMPL_CYCLE_COLLECTION_3(nsTreeWalker, mFilter, mCurrentNode, mRoot)
 
+DOMCI_DATA(TreeWalker, nsTreeWalker)
+
 // QueryInterface implementation for nsTreeWalker
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsTreeWalker)
     NS_INTERFACE_MAP_ENTRY(nsIDOMTreeWalker)

content/base/src/nsXMLHttpRequest.cpp

@@ -617,6 +617,8 @@ nsXMLHttpRequestUpload::~nsXMLHttpRequestUpload()
   }
 }
 
+DOMCI_DATA(XMLHttpRequestUpload, nsXMLHttpRequestUpload)
+
 NS_INTERFACE_MAP_BEGIN(nsXMLHttpRequestUpload)
   NS_INTERFACE_MAP_ENTRY(nsIXMLHttpRequestUpload)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XMLHttpRequestUpload)
@@ -1010,6 +1012,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsXMLHttpRequest,
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mUpload)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
+DOMCI_DATA(XMLHttpRequest, nsXMLHttpRequest)
 
 // QueryInterface implementation for nsXMLHttpRequest
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsXMLHttpRequest)
@@ -3270,6 +3273,8 @@ nsXMLHttpProgressEvent::~nsXMLHttpProgressEvent()
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsXMLHttpProgressEvent)
 
+DOMCI_DATA(XMLHttpProgressEvent, nsXMLHttpProgressEvent)
+
 // QueryInterface implementation for nsXMLHttpProgressEvent
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXMLHttpProgressEvent)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMProgressEvent)

content/canvas/src/WebGLContext.cpp

@@ -367,6 +367,8 @@ WebGLContext::GetThebesSurface(gfxASurface **surface)
 NS_IMPL_ADDREF(WebGLContext)
 NS_IMPL_RELEASE(WebGLContext)
 
+DOMCI_DATA(CanvasRenderingContextWebGL, WebGLContext)
+
 NS_INTERFACE_MAP_BEGIN(WebGLContext)
   NS_INTERFACE_MAP_ENTRY(nsICanvasRenderingContextWebGL)
   NS_INTERFACE_MAP_ENTRY(nsICanvasRenderingContextInternal)
@@ -378,6 +380,8 @@ NS_INTERFACE_MAP_END
 NS_IMPL_ADDREF(WebGLBuffer)
 NS_IMPL_RELEASE(WebGLBuffer)
 
+DOMCI_DATA(WebGLBuffer, WebGLBuffer)
+
 NS_INTERFACE_MAP_BEGIN(WebGLBuffer)
   NS_INTERFACE_MAP_ENTRY(nsIWebGLBuffer)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
@@ -387,6 +391,8 @@ NS_INTERFACE_MAP_END
 NS_IMPL_ADDREF(WebGLTexture)
 NS_IMPL_RELEASE(WebGLTexture)
 
+DOMCI_DATA(WebGLTexture, WebGLTexture)
+
 NS_INTERFACE_MAP_BEGIN(WebGLTexture)
   NS_INTERFACE_MAP_ENTRY(nsIWebGLTexture)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
@@ -396,6 +402,8 @@ NS_INTERFACE_MAP_END
 NS_IMPL_ADDREF(WebGLProgram)
 NS_IMPL_RELEASE(WebGLProgram)
 
+DOMCI_DATA(WebGLProgram, WebGLProgram)
+
 NS_INTERFACE_MAP_BEGIN(WebGLProgram)
   NS_INTERFACE_MAP_ENTRY(nsIWebGLProgram)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
@@ -405,6 +413,8 @@ NS_INTERFACE_MAP_END
 NS_IMPL_ADDREF(WebGLShader)
 NS_IMPL_RELEASE(WebGLShader)
 
+DOMCI_DATA(WebGLShader, WebGLShader)
+
 NS_INTERFACE_MAP_BEGIN(WebGLShader)
   NS_INTERFACE_MAP_ENTRY(nsIWebGLShader)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
@@ -414,6 +424,8 @@ NS_INTERFACE_MAP_END
 NS_IMPL_ADDREF(WebGLFramebuffer)
 NS_IMPL_RELEASE(WebGLFramebuffer)
 
+DOMCI_DATA(WebGLFramebuffer, WebGLFramebuffer)
+
 NS_INTERFACE_MAP_BEGIN(WebGLFramebuffer)
   NS_INTERFACE_MAP_ENTRY(nsIWebGLFramebuffer)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
@@ -423,6 +435,8 @@ NS_INTERFACE_MAP_END
 NS_IMPL_ADDREF(WebGLRenderbuffer)
 NS_IMPL_RELEASE(WebGLRenderbuffer)
 
+DOMCI_DATA(WebGLRenderbuffer, WebGLRenderbuffer)
+
 NS_INTERFACE_MAP_BEGIN(WebGLRenderbuffer)
   NS_INTERFACE_MAP_ENTRY(nsIWebGLRenderbuffer)
   NS_INTERFACE_MAP_ENTRY(nsISupports)

content/canvas/src/nsCanvasRenderingContext2D.cpp

@@ -220,6 +220,8 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsCanvasGradient, NS_CANVASGRADIENT_PRIVATE_IID)
 NS_IMPL_ADDREF(nsCanvasGradient)
 NS_IMPL_RELEASE(nsCanvasGradient)
 
+DOMCI_DATA(CanvasGradient, nsCanvasGradient)
+
 NS_INTERFACE_MAP_BEGIN(nsCanvasGradient)
   NS_INTERFACE_MAP_ENTRY(nsCanvasGradient)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCanvasGradient)
@@ -266,6 +268,8 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsCanvasPattern, NS_CANVASPATTERN_PRIVATE_IID)
 NS_IMPL_ADDREF(nsCanvasPattern)
 NS_IMPL_RELEASE(nsCanvasPattern)
 
+DOMCI_DATA(CanvasPattern, nsCanvasPattern)
+
 NS_INTERFACE_MAP_BEGIN(nsCanvasPattern)
   NS_INTERFACE_MAP_ENTRY(nsCanvasPattern)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCanvasPattern)
@@ -303,6 +307,8 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsTextMetrics, NS_TEXTMETRICS_PRIVATE_IID)
 NS_IMPL_ADDREF(nsTextMetrics)
 NS_IMPL_RELEASE(nsTextMetrics)
 
+DOMCI_DATA(TextMetrics, nsTextMetrics)
+
 NS_INTERFACE_MAP_BEGIN(nsTextMetrics)
   NS_INTERFACE_MAP_ENTRY(nsTextMetrics)
   NS_INTERFACE_MAP_ENTRY(nsIDOMTextMetrics)
@@ -664,6 +670,8 @@ protected:
 NS_IMPL_ADDREF(nsCanvasRenderingContext2D)
 NS_IMPL_RELEASE(nsCanvasRenderingContext2D)
 
+DOMCI_DATA(CanvasRenderingContext2D, nsCanvasRenderingContext2D)
+
 NS_INTERFACE_MAP_BEGIN(nsCanvasRenderingContext2D)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCanvasRenderingContext2D)
   NS_INTERFACE_MAP_ENTRY(nsICanvasRenderingContextInternal)

content/events/src/nsDOMBeforeUnloadEvent.cpp

@@ -42,6 +42,8 @@
 NS_IMPL_ADDREF_INHERITED(nsDOMBeforeUnloadEvent, nsDOMEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMBeforeUnloadEvent, nsDOMEvent)
 
+DOMCI_DATA(BeforeUnloadEvent, nsDOMBeforeUnloadEvent)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMBeforeUnloadEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMBeforeUnloadEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(BeforeUnloadEvent)

content/events/src/nsDOMCommandEvent.cpp

@@ -59,6 +59,8 @@ nsDOMCommandEvent::~nsDOMCommandEvent()
   }
 }
 
+DOMCI_DATA(CommandEvent, nsDOMCommandEvent)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMCommandEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCommandEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CommandEvent)

content/events/src/nsDOMDataContainerEvent.cpp

@@ -63,6 +63,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 NS_IMPL_ADDREF_INHERITED(nsDOMDataContainerEvent, nsDOMEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMDataContainerEvent, nsDOMEvent)
 
+DOMCI_DATA(DataContainerEvent, nsDOMDataContainerEvent)
+
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMDataContainerEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMDataContainerEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DataContainerEvent)

content/events/src/nsDOMDataTransfer.cpp

@@ -56,6 +56,8 @@ NS_IMPL_CYCLE_COLLECTION_2(nsDOMDataTransfer, mDragTarget, mDragImage)
 NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMDataTransfer)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMDataTransfer)
 
+DOMCI_DATA(DataTransfer, nsDOMDataTransfer)
+
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMDataTransfer)
   NS_INTERFACE_MAP_ENTRY(nsIDOMDataTransfer)
   NS_INTERFACE_MAP_ENTRY(nsIDOMNSDataTransfer)

content/events/src/nsDOMDragEvent.cpp

@@ -71,6 +71,8 @@ nsDOMDragEvent::~nsDOMDragEvent()
 NS_IMPL_ADDREF_INHERITED(nsDOMDragEvent, nsDOMMouseEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMDragEvent, nsDOMMouseEvent)
 
+DOMCI_DATA(DragEvent, nsDOMDragEvent)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMDragEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMDragEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DragEvent)

content/events/src/nsDOMEvent.cpp

@@ -163,6 +163,8 @@ nsDOMEvent::~nsDOMEvent()
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsDOMEvent)
 
+DOMCI_DATA(Event, nsDOMEvent)
+
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMEvent)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMEvent)

content/events/src/nsDOMKeyboardEvent.cpp

@@ -67,6 +67,8 @@ nsDOMKeyboardEvent::~nsDOMKeyboardEvent()
 NS_IMPL_ADDREF_INHERITED(nsDOMKeyboardEvent, nsDOMUIEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMKeyboardEvent, nsDOMUIEvent)
 
+DOMCI_DATA(KeyboardEvent, nsDOMKeyboardEvent)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMKeyboardEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMKeyEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(KeyboardEvent)

content/events/src/nsDOMMessageEvent.cpp

@@ -49,6 +49,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsDOMMessageEvent, nsDOMEvent)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mSource)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
+DOMCI_DATA(MessageEvent, nsDOMMessageEvent)
+
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMMessageEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMMessageEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MessageEvent)

content/events/src/nsDOMMouseEvent.cpp

@@ -95,6 +95,8 @@ nsDOMMouseEvent::~nsDOMMouseEvent()
 NS_IMPL_ADDREF_INHERITED(nsDOMMouseEvent, nsDOMUIEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMMouseEvent, nsDOMUIEvent)
 
+DOMCI_DATA(MouseEvent, nsDOMMouseEvent)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMMouseEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMMouseEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMNSMouseEvent)

content/events/src/nsDOMMouseScrollEvent.cpp

@@ -80,6 +80,8 @@ nsDOMMouseScrollEvent::~nsDOMMouseScrollEvent()
 NS_IMPL_ADDREF_INHERITED(nsDOMMouseScrollEvent, nsDOMMouseEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMMouseScrollEvent, nsDOMMouseEvent)
 
+DOMCI_DATA(MouseScrollEvent, nsDOMMouseScrollEvent)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMMouseScrollEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMMouseScrollEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MouseScrollEvent)

content/events/src/nsDOMMutationEvent.cpp

@@ -59,6 +59,8 @@ nsDOMMutationEvent::~nsDOMMutationEvent()
   }
 }
 
+DOMCI_DATA(MutationEvent, nsDOMMutationEvent)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMMutationEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMMutationEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MutationEvent)

content/events/src/nsDOMNotifyPaintEvent.cpp

@@ -56,6 +56,8 @@ nsDOMNotifyPaintEvent::nsDOMNotifyPaintEvent(nsPresContext* aPresContext,
   }
 }
 
+DOMCI_DATA(NotifyPaintEvent, nsDOMNotifyPaintEvent)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMNotifyPaintEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMNotifyPaintEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(NotifyPaintEvent)

content/events/src/nsDOMOrientationEvent.cpp

@@ -40,6 +40,8 @@
 NS_IMPL_ADDREF_INHERITED(nsDOMOrientationEvent, nsDOMEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMOrientationEvent, nsDOMEvent)
 
+DOMCI_DATA(OrientationEvent, nsDOMOrientationEvent)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMOrientationEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMOrientationEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(OrientationEvent)

content/events/src/nsDOMPageTransitionEvent.cpp

@@ -39,6 +39,8 @@
 #include "nsDOMPageTransitionEvent.h"
 #include "nsContentUtils.h"
 
+DOMCI_DATA(PageTransitionEvent, nsDOMPageTransitionEvent)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMPageTransitionEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMPageTransitionEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(PageTransitionEvent)

content/events/src/nsDOMPopStateEvent.cpp

@@ -48,6 +48,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsDOMPopStateEvent, nsDOMEvent
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mState)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
+DOMCI_DATA(PopStateEvent, nsDOMPopStateEvent)
+
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMPopStateEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMPopStateEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(PopStateEvent)

content/events/src/nsDOMPopupBlockedEvent.cpp

@@ -44,6 +44,8 @@
 NS_IMPL_ADDREF_INHERITED(nsDOMPopupBlockedEvent, nsDOMEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMPopupBlockedEvent, nsDOMEvent)
 
+DOMCI_DATA(PopupBlockedEvent, nsDOMPopupBlockedEvent)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMPopupBlockedEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMPopupBlockedEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(PopupBlockedEvent)

content/events/src/nsDOMProgressEvent.cpp

@@ -40,6 +40,8 @@
 #include "nsContentUtils.h"
 
 
+DOMCI_DATA(ProgressEvent, nsDOMProgressEvent)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMProgressEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMProgressEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ProgressEvent)

content/events/src/nsDOMScrollAreaEvent.cpp

@@ -59,6 +59,8 @@ nsDOMScrollAreaEvent::~nsDOMScrollAreaEvent()
 NS_IMPL_ADDREF_INHERITED(nsDOMScrollAreaEvent, nsDOMUIEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMScrollAreaEvent, nsDOMUIEvent)
 
+DOMCI_DATA(ScrollAreaEvent, nsDOMScrollAreaEvent)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMScrollAreaEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMScrollAreaEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ScrollAreaEvent)

content/events/src/nsDOMSimpleGestureEvent.cpp

@@ -66,6 +66,8 @@ nsDOMSimpleGestureEvent::~nsDOMSimpleGestureEvent()
 NS_IMPL_ADDREF_INHERITED(nsDOMSimpleGestureEvent, nsDOMUIEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMSimpleGestureEvent, nsDOMUIEvent)
 
+DOMCI_DATA(SimpleGestureEvent, nsDOMSimpleGestureEvent)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMSimpleGestureEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMSimpleGestureEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SimpleGestureEvent)

content/events/src/nsDOMTransitionEvent.cpp

@@ -62,6 +62,8 @@ nsDOMTransitionEvent::~nsDOMTransitionEvent()
   }
 }
 
+DOMCI_DATA(TransitionEvent, nsDOMTransitionEvent)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMTransitionEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMTransitionEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(TransitionEvent)

content/events/src/nsDOMUIEvent.cpp

@@ -114,6 +114,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 NS_IMPL_ADDREF_INHERITED(nsDOMUIEvent, nsDOMEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMUIEvent, nsDOMEvent)
 
+DOMCI_DATA(UIEvent, nsDOMUIEvent)
+
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMUIEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMUIEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMNSUIEvent)

content/events/src/nsDOMXULCommandEvent.cpp

@@ -68,6 +68,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsDOMXULCommandEvent,
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mSourceEvent)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
+DOMCI_DATA(XULCommandEvent, nsDOMXULCommandEvent)
+
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMXULCommandEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMXULCommandEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XULCommandEvent)

content/events/src/nsEventListenerService.cpp

@@ -57,6 +57,8 @@
 
 NS_IMPL_CYCLE_COLLECTION_1(nsEventListenerInfo, mListener)
 
+DOMCI_DATA(EventListenerInfo, nsEventListenerInfo)
+
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsEventListenerInfo)
   NS_INTERFACE_MAP_ENTRY(nsIEventListenerInfo)
   NS_INTERFACE_MAP_ENTRY(nsISupports)

content/events/src/nsPaintRequest.cpp

@@ -42,6 +42,8 @@
 #include "nsClientRect.h"
 #include "nsIFrame.h"
 
+DOMCI_DATA(PaintRequest, nsPaintRequest)
+
 NS_INTERFACE_TABLE_HEAD(nsPaintRequest)
   NS_INTERFACE_TABLE1(nsPaintRequest, nsIDOMPaintRequest)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
@@ -79,6 +81,8 @@ nsPaintRequest::GetReason(nsAString& aResult)
   return NS_OK;
 }
 
+DOMCI_DATA(PaintRequestList, nsPaintRequestList)
+
 NS_INTERFACE_TABLE_HEAD(nsPaintRequestList)
   NS_INTERFACE_TABLE1(nsPaintRequestList, nsIDOMPaintRequestList)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE

content/html/content/src/nsClientRect.cpp

@@ -42,6 +42,8 @@
 
 #include "nsPresContext.h"
 
+DOMCI_DATA(ClientRect, nsClientRect)
+
 NS_INTERFACE_TABLE_HEAD(nsClientRect)
   NS_INTERFACE_TABLE1(nsClientRect, nsIDOMClientRect)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
@@ -98,6 +100,8 @@ nsClientRect::GetHeight(float* aResult)
   return NS_OK;
 }
 
+DOMCI_DATA(ClientRectList, nsClientRectList)
+
 NS_INTERFACE_TABLE_HEAD(nsClientRectList)
   NS_INTERFACE_TABLE1(nsClientRectList, nsIDOMClientRectList)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE

content/html/content/src/nsHTMLAnchorElement.cpp

@@ -150,6 +150,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLAnchorElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLAnchorElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLAnchorElement, nsHTMLAnchorElement)
+
 // QueryInterface implementation for nsHTMLAnchorElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLAnchorElement)
   NS_HTML_CONTENT_INTERFACE_TABLE5(nsHTMLAnchorElement,

content/html/content/src/nsHTMLAreaElement.cpp

@@ -135,6 +135,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLAreaElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLAreaElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLAreaElement, nsHTMLAreaElement)
+
 // QueryInterface implementation for nsHTMLAreaElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLAreaElement)
   NS_HTML_CONTENT_INTERFACE_TABLE5(nsHTMLAreaElement,

content/html/content/src/nsHTMLAudioElement.cpp

@@ -94,6 +94,8 @@ NS_NewHTMLAudioElement(nsINodeInfo *aNodeInfo, PRBool aFromParser)
 NS_IMPL_ADDREF_INHERITED(nsHTMLAudioElement, nsHTMLMediaElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLAudioElement, nsHTMLMediaElement)
 
+DOMCI_DATA(HTMLAudioElement, nsHTMLAudioElement)
+
 NS_INTERFACE_TABLE_HEAD(nsHTMLAudioElement)
 NS_HTML_CONTENT_INTERFACE_TABLE3(nsHTMLAudioElement, nsIDOMHTMLMediaElement,
                                  nsIDOMHTMLAudioElement, nsIJSNativeInitializer)

content/html/content/src/nsHTMLBRElement.cpp

@@ -91,6 +91,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLBRElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLBRElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLBRElement, nsHTMLBRElement)
+
 // QueryInterface implementation for nsHTMLBRElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLBRElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLBRElement, nsIDOMHTMLBRElement)

content/html/content/src/nsHTMLBodyElement.cpp

@@ -296,6 +296,8 @@ nsHTMLBodyElement::~nsHTMLBodyElement()
 NS_IMPL_ADDREF_INHERITED(nsHTMLBodyElement, nsGenericElement) 
 NS_IMPL_RELEASE_INHERITED(nsHTMLBodyElement, nsGenericElement) 
 
+DOMCI_DATA(HTMLBodyElement, nsHTMLBodyElement)
+
 // QueryInterface implementation for nsHTMLBodyElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLBodyElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLBodyElement, nsIDOMHTMLBodyElement)

content/html/content/src/nsHTMLButtonElement.cpp

@@ -161,6 +161,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLButtonElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLButtonElement, nsGenericElement)
 
 
+DOMCI_DATA(HTMLButtonElement, nsHTMLButtonElement)
+
 // QueryInterface implementation for nsHTMLButtonElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLButtonElement)
   NS_HTML_CONTENT_INTERFACE_TABLE2(nsHTMLButtonElement,

content/html/content/src/nsHTMLCanvasElement.cpp

@@ -161,6 +161,8 @@ nsHTMLCanvasElement::~nsHTMLCanvasElement()
 NS_IMPL_ADDREF_INHERITED(nsHTMLCanvasElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLCanvasElement, nsGenericElement)
 
+DOMCI_DATA(HTMLCanvasElement, nsHTMLCanvasElement)
+
 NS_INTERFACE_TABLE_HEAD(nsHTMLCanvasElement)
   NS_HTML_CONTENT_INTERFACE_TABLE2(nsHTMLCanvasElement,
                                    nsIDOMHTMLCanvasElement,

content/html/content/src/nsHTMLDelElement.cpp

@@ -83,6 +83,8 @@ nsHTMLModElement::~nsHTMLModElement()
 NS_IMPL_ADDREF_INHERITED(nsHTMLModElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLModElement, nsGenericElement)
 
+DOMCI_DATA(HTMLDelElement, nsHTMLModElement)
+DOMCI_DATA(HTMLInsElement, nsHTMLModElement)
 
 // QueryInterface implementation for nsHTMLModElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLModElement)

content/html/content/src/nsHTMLDivElement.cpp

@@ -92,6 +92,8 @@ NS_IMPL_RELEASE_INHERITED(nsHTMLDivElement, nsGenericElement)
 
 
 
+DOMCI_DATA(HTMLDivElement, nsHTMLDivElement)
+
 // QueryInterface implementation for nsHTMLDivElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLDivElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLDivElement, nsIDOMHTMLDivElement)

content/html/content/src/nsHTMLFieldSetElement.cpp

@@ -95,6 +95,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLFieldSetElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLFieldSetElement, nsGenericElement)
 
 
+DOMCI_DATA(HTMLFieldSetElement, nsHTMLFieldSetElement)
+
 // QueryInterface implementation for nsHTMLFieldSetElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLFieldSetElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLFieldSetElement,

content/html/content/src/nsHTMLFontElement.cpp

@@ -95,6 +95,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLFontElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLFontElement, nsGenericElement)
 
 
+DOMCI_DATA(HTMLFontElement, nsHTMLFontElement)
+
 // QueryInterface implementation for nsHTMLFontElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLFontElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLFontElement, nsIDOMHTMLFontElement)

content/html/content/src/nsHTMLFormElement.cpp

@@ -301,6 +301,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLFormElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLFormElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLFormElement, nsHTMLFormElement)
+
 // QueryInterface implementation for nsHTMLFormElement
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLFormElement)
   NS_HTML_CONTENT_INTERFACE_TABLE5(nsHTMLFormElement,
@@ -1875,6 +1877,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsFormControlList)
   tmp->mNameLookupTable.EnumerateRead(ControlTraverser, &cb);
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
+DOMCI_DATA(HTMLCollection, nsFormControlList)
+
 // XPConnect interface list for nsFormControlList
 NS_INTERFACE_TABLE_HEAD(nsFormControlList)
   NS_INTERFACE_TABLE2(nsFormControlList,

content/html/content/src/nsHTMLFrameElement.cpp

@@ -93,6 +93,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLFrameElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLFrameElement, nsGenericElement)
 
 
+DOMCI_DATA(HTMLFrameElement, nsHTMLFrameElement)
+
 // QueryInterface implementation for nsHTMLFrameElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLFrameElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLFrameElement, nsIDOMHTMLFrameElement)

content/html/content/src/nsHTMLFrameSetElement.cpp

@@ -137,6 +137,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLFrameSetElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLFrameSetElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLFrameSetElement, nsHTMLFrameSetElement)
+
 // QueryInterface implementation for nsHTMLFrameSetElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLFrameSetElement)
   NS_HTML_CONTENT_INTERFACE_TABLE2(nsHTMLFrameSetElement,

content/html/content/src/nsHTMLHRElement.cpp

@@ -97,6 +97,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLHRElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLHRElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLHRElement, nsHTMLHRElement)
+
 // QueryInterface implementation for nsHTMLHRElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLHRElement)
   NS_HTML_CONTENT_INTERFACE_TABLE2(nsHTMLHRElement,

content/html/content/src/nsHTMLHeadElement.cpp

@@ -85,6 +85,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLHeadElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLHeadElement, nsGenericElement)
 
 
+DOMCI_DATA(HTMLHeadElement, nsHTMLHeadElement)
+
 // QueryInterface implementation for nsHTMLHeadElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLHeadElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLHeadElement, nsIDOMHTMLHeadElement)

content/html/content/src/nsHTMLHeadingElement.cpp

@@ -93,6 +93,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLHeadingElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLHeadingElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLHeadingElement, nsHTMLHeadingElement)
+
 // QueryInterface implementation for nsHTMLHeadingElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLHeadingElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLHeadingElement,

content/html/content/src/nsHTMLHtmlElement.cpp

@@ -87,6 +87,8 @@ NS_IMPL_RELEASE_INHERITED(nsHTMLHtmlElement, nsGenericElement)
 
 
 
+DOMCI_DATA(HTMLHtmlElement, nsHTMLHtmlElement)
+
 // QueryInterface implementation for nsHTMLHtmlElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLHtmlElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLHtmlElement, nsIDOMHTMLHtmlElement)

content/html/content/src/nsHTMLIFrameElement.cpp

@@ -108,6 +108,8 @@ nsHTMLIFrameElement::~nsHTMLIFrameElement()
 NS_IMPL_ADDREF_INHERITED(nsHTMLIFrameElement,nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLIFrameElement,nsGenericElement)
 
+DOMCI_DATA(HTMLIFrameElement, nsHTMLIFrameElement)
+
 // QueryInterface implementation for nsHTMLIFrameElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLIFrameElement)
   NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(nsHTMLIFrameElement)

content/html/content/src/nsHTMLImageElement.cpp

@@ -193,6 +193,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLImageElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLImageElement, nsGenericElement)
 
 
+DOMCI_DATA(HTMLImageElement, nsHTMLImageElement)
+
 // QueryInterface implementation for nsHTMLImageElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLImageElement)
   NS_HTML_CONTENT_INTERFACE_TABLE6(nsHTMLImageElement,

content/html/content/src/nsHTMLInputElement.cpp

@@ -498,6 +498,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLInputElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLInputElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLInputElement, nsHTMLInputElement)
+
 // QueryInterface implementation for nsHTMLInputElement
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLInputElement)
   NS_HTML_CONTENT_INTERFACE_TABLE10(nsHTMLInputElement,

content/html/content/src/nsHTMLLIElement.cpp

@@ -92,6 +92,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLLIElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLLIElement, nsGenericElement)
 
 
+DOMCI_DATA(HTMLLIElement, nsHTMLLIElement)
+
 // QueryInterface implementation for nsHTMLLIElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLLIElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLLIElement, nsIDOMHTMLLIElement)

content/html/content/src/nsHTMLLabelElement.cpp

@@ -137,6 +137,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLLabelElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLLabelElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLLabelElement, nsHTMLLabelElement)
+
 // QueryInterface implementation for nsHTMLLabelElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLLabelElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLLabelElement, nsIDOMHTMLLabelElement)

content/html/content/src/nsHTMLLegendElement.cpp

@@ -127,6 +127,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLLegendElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLLegendElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLLegendElement, nsHTMLLegendElement)
+
 // QueryInterface implementation for nsHTMLLegendElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLLegendElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLLegendElement, nsIDOMHTMLLegendElement)

content/html/content/src/nsHTMLLinkElement.cpp

@@ -146,6 +146,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLLinkElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLLinkElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLLinkElement, nsHTMLLinkElement)
+
 // QueryInterface implementation for nsHTMLLinkElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLLinkElement)
   NS_HTML_CONTENT_INTERFACE_TABLE5(nsHTMLLinkElement,

content/html/content/src/nsHTMLMapElement.cpp

@@ -101,6 +101,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLMapElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLMapElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLMapElement, nsHTMLMapElement)
+
 // QueryInterface implementation for nsHTMLMapElement
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLMapElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLMapElement, nsIDOMHTMLMapElement)

content/html/content/src/nsHTMLMediaError.cpp

@@ -41,6 +41,8 @@
 NS_IMPL_ADDREF(nsHTMLMediaError)
 NS_IMPL_RELEASE(nsHTMLMediaError)
 
+DOMCI_DATA(HTMLMediaError, nsHTMLMediaError)
+
 NS_INTERFACE_MAP_BEGIN(nsHTMLMediaError)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
   NS_INTERFACE_MAP_ENTRY(nsIDOMHTMLMediaError)

content/html/content/src/nsHTMLMetaElement.cpp

@@ -85,6 +85,7 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLMetaElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLMetaElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLMetaElement, nsHTMLMetaElement)
 
 // QueryInterface implementation for nsHTMLMetaElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLMetaElement)

content/html/content/src/nsHTMLOListElement.cpp

@@ -102,6 +102,10 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLSharedListElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLSharedListElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLOListElement, nsHTMLSharedListElement)
+DOMCI_DATA(HTMLDListElement, nsHTMLSharedListElement)
+DOMCI_DATA(HTMLUListElement, nsHTMLSharedListElement)
+
 // QueryInterface implementation for nsHTMLSharedListElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLSharedListElement)
   NS_HTML_CONTENT_INTERFACE_TABLE_AMBIGUOUS_BEGIN(nsHTMLSharedListElement,

content/html/content/src/nsHTMLObjectElement.cpp

@@ -185,6 +185,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 NS_IMPL_ADDREF_INHERITED(nsHTMLObjectElement, nsGenericElement) 
 NS_IMPL_RELEASE_INHERITED(nsHTMLObjectElement, nsGenericElement) 
 
+DOMCI_DATA(HTMLObjectElement, nsHTMLObjectElement)
+
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLObjectElement)
   NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(nsHTMLObjectElement)
     NS_INTERFACE_TABLE_ENTRY(nsHTMLObjectElement, nsIDOMHTMLObjectElement)

content/html/content/src/nsHTMLOptGroupElement.cpp

@@ -114,6 +114,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLOptGroupElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLOptGroupElement, nsGenericElement)
 
 
+DOMCI_DATA(HTMLOptGroupElement, nsHTMLOptGroupElement)
+
 // QueryInterface implementation for nsHTMLOptGroupElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLOptGroupElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLOptGroupElement,

content/html/content/src/nsHTMLOptionElement.cpp

@@ -180,6 +180,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLOptionElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLOptionElement, nsGenericElement)
 
 
+DOMCI_DATA(HTMLOptionElement, nsHTMLOptionElement)
+
 // QueryInterface implementation for nsHTMLOptionElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLOptionElement)
   NS_HTML_CONTENT_INTERFACE_TABLE4(nsHTMLOptionElement,

content/html/content/src/nsHTMLParagraphElement.cpp

@@ -95,6 +95,7 @@ nsHTMLParagraphElement::~nsHTMLParagraphElement()
 NS_IMPL_ADDREF_INHERITED(nsHTMLParagraphElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLParagraphElement, nsGenericElement)
 
+DOMCI_DATA(HTMLParagraphElement, nsHTMLParagraphElement)
 
 // QueryInterface implementation for nsHTMLParagraphElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLParagraphElement)

content/html/content/src/nsHTMLPreElement.cpp

@@ -98,6 +98,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLPreElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLPreElement, nsGenericElement)
 
 
+DOMCI_DATA(HTMLPreElement, nsHTMLPreElement)
+
 // QueryInterface implementation for nsHTMLPreElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLPreElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLPreElement, nsIDOMHTMLPreElement)

content/html/content/src/nsHTMLScriptElement.cpp

@@ -377,6 +377,8 @@ nsHTMLScriptElement::~nsHTMLScriptElement()
 NS_IMPL_ADDREF_INHERITED(nsHTMLScriptElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLScriptElement, nsGenericElement)
 
+DOMCI_DATA(HTMLScriptElement, nsHTMLScriptElement)
+
 // QueryInterface implementation for nsHTMLScriptElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLScriptElement)
   NS_HTML_CONTENT_INTERFACE_TABLE5(nsHTMLScriptElement,

content/html/content/src/nsHTMLSelectElement.cpp

@@ -173,6 +173,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLSelectElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLSelectElement, nsGenericElement)
 
 
+DOMCI_DATA(HTMLSelectElement, nsHTMLSelectElement)
+
 // QueryInterface implementation for nsHTMLSelectElement
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLSelectElement)
   NS_HTML_CONTENT_INTERFACE_TABLE3(nsHTMLSelectElement,
@@ -1808,6 +1810,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 // nsISupports
 
+DOMCI_DATA(HTMLOptionsCollection, nsHTMLOptionCollection)
+
 // QueryInterface implementation for nsHTMLOptionCollection
 NS_INTERFACE_TABLE_HEAD(nsHTMLOptionCollection)
   NS_INTERFACE_TABLE4(nsHTMLOptionCollection,

content/html/content/src/nsHTMLSharedElement.cpp

@@ -146,6 +146,16 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLSharedElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLSharedElement, nsGenericElement)
 
 
+DOMCI_DATA(HTMLParamElement, nsHTMLSharedElement)
+DOMCI_DATA(HTMLWBRElement, nsHTMLSharedElement)
+DOMCI_DATA(HTMLIsIndexElement, nsHTMLSharedElement)
+DOMCI_DATA(HTMLBaseElement, nsHTMLSharedElement)
+DOMCI_DATA(HTMLSpacerElement, nsHTMLSharedElement)
+DOMCI_DATA(HTMLDirectoryElement, nsHTMLSharedElement)
+DOMCI_DATA(HTMLMenuElement, nsHTMLSharedElement)
+DOMCI_DATA(HTMLQuoteElement, nsHTMLSharedElement)
+DOMCI_DATA(HTMLBaseFontElement, nsHTMLSharedElement)
+
 // QueryInterface implementation for nsHTMLSharedElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLSharedElement)
   NS_HTML_CONTENT_INTERFACE_TABLE_AMBIGUOUS_BEGIN(nsHTMLSharedElement,

content/html/content/src/nsHTMLSharedObjectElement.cpp

@@ -217,6 +217,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 NS_IMPL_ADDREF_INHERITED(nsHTMLSharedObjectElement, nsGenericElement) 
 NS_IMPL_RELEASE_INHERITED(nsHTMLSharedObjectElement, nsGenericElement) 
 
+DOMCI_DATA(HTMLAppletElement, nsHTMLSharedObjectElement)
+DOMCI_DATA(HTMLEmbedElement, nsHTMLSharedObjectElement)
+
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLSharedObjectElement)
   NS_HTML_CONTENT_INTERFACE_TABLE_AMBIGUOUS_BEGIN(nsHTMLSharedObjectElement,
                                                   nsIDOMHTMLAppletElement)

content/html/content/src/nsHTMLSourceElement.cpp

@@ -100,6 +100,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLSourceElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLSourceElement, nsGenericElement)
 
 
+DOMCI_DATA(HTMLSourceElement, nsHTMLSourceElement)
+
 // QueryInterface implementation for nsHTMLSourceElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLSourceElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLSourceElement, nsIDOMHTMLSourceElement)

content/html/content/src/nsHTMLSpanElement.cpp

@@ -86,6 +86,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLSpanElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLSpanElement, nsGenericElement)
 
 
+DOMCI_DATA(HTMLSpanElement, nsHTMLSpanElement)
+
 // QueryInterface implementation for nsHTMLSpanElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLSpanElement)
   NS_HTML_CONTENT_INTERFACE_TABLE0(nsHTMLSpanElement)
@@ -131,6 +133,8 @@ public:
   nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
 };
 
+DOMCI_DATA(HTMLUnknownElement, nsHTMLUnknownElement)
+
 NS_INTERFACE_MAP_BEGIN(nsHTMLUnknownElement)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(HTMLUnknownElement)
 NS_INTERFACE_MAP_END_INHERITING(nsHTMLSpanElement)

content/html/content/src/nsHTMLStyleElement.cpp

@@ -135,6 +135,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLStyleElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLStyleElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLStyleElement, nsHTMLStyleElement)
+
 // QueryInterface implementation for nsHTMLStyleElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLStyleElement)
   NS_HTML_CONTENT_INTERFACE_TABLE4(nsHTMLStyleElement,

content/html/content/src/nsHTMLTableCaptionElement.cpp

@@ -93,6 +93,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLTableCaptionElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLTableCaptionElement, nsGenericElement)
 
 
+DOMCI_DATA(HTMLTableCaptionElement, nsHTMLTableCaptionElement)
+
 // QueryInterface implementation for nsHTMLTableCaptionElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLTableCaptionElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLTableCaptionElement,

content/html/content/src/nsHTMLTableCellElement.cpp

@@ -104,6 +104,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLTableCellElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLTableCellElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLTableCellElement, nsHTMLTableCellElement)
+
 // QueryInterface implementation for nsHTMLTableCellElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLTableCellElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLTableCellElement,

content/html/content/src/nsHTMLTableColElement.cpp

@@ -97,6 +97,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLTableColElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLTableColElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLTableColElement, nsHTMLTableColElement)
+
 // QueryInterface implementation for nsHTMLTableColElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLTableColElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLTableColElement,

content/html/content/src/nsHTMLTableElement.cpp

@@ -408,6 +408,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLTableElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLTableElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLTableElement, nsHTMLTableElement)
+
 // QueryInterface implementation for nsHTMLTableElement
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLTableElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLTableElement, nsIDOMHTMLTableElement)

content/html/content/src/nsHTMLTableRowElement.cpp

@@ -108,6 +108,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLTableRowElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLTableRowElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLTableRowElement, nsHTMLTableRowElement)
+
 // QueryInterface implementation for nsHTMLTableRowElement
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLTableRowElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLTableRowElement,

content/html/content/src/nsHTMLTableSectionElement.cpp

@@ -106,6 +106,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLTableSectionElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLTableSectionElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLTableSectionElement, nsHTMLTableSectionElement)
+
 // QueryInterface implementation for nsHTMLTableSectionElement
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLTableSectionElement)
   NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLTableSectionElement,

content/html/content/src/nsHTMLTextAreaElement.cpp

@@ -260,6 +260,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLTextAreaElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLTextAreaElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLTextAreaElement, nsHTMLTextAreaElement)
+
 // QueryInterface implementation for nsHTMLTextAreaElement
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLTextAreaElement)
   NS_HTML_CONTENT_INTERFACE_TABLE5(nsHTMLTextAreaElement,

content/html/content/src/nsHTMLTitleElement.cpp

@@ -108,6 +108,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLTitleElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLTitleElement, nsGenericElement) 
 
 
+DOMCI_DATA(HTMLTitleElement, nsHTMLTitleElement)
+
 // QueryInterface implementation for nsHTMLTitleElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLTitleElement)
   NS_HTML_CONTENT_INTERFACE_TABLE2(nsHTMLTitleElement,

content/html/content/src/nsHTMLVideoElement.cpp

@@ -73,6 +73,8 @@ NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(Video)
 NS_IMPL_ADDREF_INHERITED(nsHTMLVideoElement, nsHTMLMediaElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLVideoElement, nsHTMLMediaElement)
 
+DOMCI_DATA(HTMLVideoElement, nsHTMLVideoElement)
+
 NS_INTERFACE_TABLE_HEAD(nsHTMLVideoElement)
   NS_HTML_CONTENT_INTERFACE_TABLE2(nsHTMLVideoElement, nsIDOMHTMLMediaElement, nsIDOMHTMLVideoElement)
   NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLVideoElement,

content/html/document/src/nsHTMLDocument.cpp

@@ -272,6 +272,8 @@ NS_IMPL_ADDREF_INHERITED(nsHTMLDocument, nsDocument)
 NS_IMPL_RELEASE_INHERITED(nsHTMLDocument, nsDocument)
 
 
+DOMCI_DATA(HTMLDocument, nsHTMLDocument)
+
 // QueryInterface implementation for nsHTMLDocument
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLDocument)
   NS_DOCUMENT_INTERFACE_TABLE_BEGIN(nsHTMLDocument)

content/html/document/src/nsImageDocument.cpp

@@ -299,6 +299,8 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 NS_IMPL_ADDREF_INHERITED(nsImageDocument, nsMediaDocument)
 NS_IMPL_RELEASE_INHERITED(nsImageDocument, nsMediaDocument)
 
+DOMCI_DATA(ImageDocument, nsImageDocument)
+
 NS_INTERFACE_TABLE_HEAD(nsImageDocument)
   NS_HTML_DOCUMENT_INTERFACE_TABLE_BEGIN(nsImageDocument)
     NS_INTERFACE_TABLE_ENTRY(nsImageDocument, nsIImageDocument)

content/mathml/content/src/nsMathMLElement.cpp

@@ -55,6 +55,8 @@
 //----------------------------------------------------------------------
 // nsISupports methods:
 
+DOMCI_DATA(MathMLElement, nsMathMLElement)
+
 NS_INTERFACE_TABLE_HEAD(nsMathMLElement)
   NS_NODE_OFFSET_AND_INTERFACE_TABLE_BEGIN(nsMathMLElement)
     NS_INTERFACE_TABLE_ENTRY(nsMathMLElement, nsIDOMNode)

content/svg/content/src/nsDOMSVGEvent.cpp

@@ -67,6 +67,8 @@ nsDOMSVGEvent::nsDOMSVGEvent(nsPresContext* aPresContext,
 NS_IMPL_ADDREF_INHERITED(nsDOMSVGEvent, nsDOMEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMSVGEvent, nsDOMEvent)
 
+DOMCI_DATA(SVGEvent, nsDOMSVGEvent)
+
 NS_INTERFACE_MAP_BEGIN(nsDOMSVGEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMSVGEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGEvent)