diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h index f1928053d8f6..da100d46cc5f 100644 --- a/content/base/public/nsContentUtils.h +++ b/content/base/public/nsContentUtils.h @@ -1760,9 +1760,6 @@ private: nsAutoGCRoot NS_AUTO_GCROOT_PASTE(_autoGCRoot_, __LINE__) \ (ptr, result) -#define NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(_class) \ - NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(_class) - #define NS_INTERFACE_MAP_ENTRY_TEAROFF(_interface, _allocator) \ if (aIID.Equals(NS_GET_IID(_interface))) { \ foundInterface = static_cast<_interface *>(_allocator); \ diff --git a/content/base/src/nsCommentNode.cpp b/content/base/src/nsCommentNode.cpp index 7b9bf0ec7bc6..3dec0564002e 100644 --- a/content/base/src/nsCommentNode.cpp +++ b/content/base/src/nsCommentNode.cpp @@ -111,7 +111,7 @@ nsCommentNode::~nsCommentNode() NS_INTERFACE_TABLE_HEAD(nsCommentNode) NS_NODE_INTERFACE_TABLE3(nsCommentNode, nsIDOMNode, nsIDOMCharacterData, nsIDOMComment) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(Comment) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Comment) NS_INTERFACE_MAP_END_INHERITING(nsGenericDOMDataNode) diff --git a/content/base/src/nsContentList.cpp b/content/base/src/nsContentList.cpp index 61ad6793b24b..4f2e8917f83f 100644 --- a/content/base/src/nsContentList.cpp +++ b/content/base/src/nsContentList.cpp @@ -91,7 +91,7 @@ NS_INTERFACE_TABLE_HEAD(nsBaseContentList) NS_OFFSET_AND_INTERFACE_TABLE_END NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsBaseContentList) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(NodeList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(NodeList) NS_INTERFACE_MAP_END @@ -451,7 +451,7 @@ NS_INTERFACE_TABLE_HEAD(nsContentList) NS_INTERFACE_TABLE_ENTRY(nsContentList, nsIMutationObserver) NS_OFFSET_AND_INTERFACE_TABLE_END NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(ContentList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ContentList) NS_INTERFACE_MAP_END_INHERITING(nsBaseContentList) diff --git a/content/base/src/nsDOMAttribute.cpp b/content/base/src/nsDOMAttribute.cpp index 213e77dc228a..0e252dd7c051 100644 --- a/content/base/src/nsDOMAttribute.cpp +++ b/content/base/src/nsDOMAttribute.cpp @@ -124,7 +124,7 @@ NS_INTERFACE_TABLE_HEAD(nsDOMAttribute) nsDOMEventRTTearoff::Create(this)) NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMNSEventTarget, nsDOMEventRTTearoff::Create(this)) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(Attr) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Attr) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsDOMAttribute, nsIDOMAttr) diff --git a/content/base/src/nsDOMAttributeMap.cpp b/content/base/src/nsDOMAttributeMap.cpp index 59f3f129616e..9a438b235ef9 100644 --- a/content/base/src/nsDOMAttributeMap.cpp +++ b/content/base/src/nsDOMAttributeMap.cpp @@ -123,7 +123,7 @@ NS_INTERFACE_TABLE_HEAD(nsDOMAttributeMap) NS_OFFSET_AND_INTERFACE_TABLE_END NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsDOMAttributeMap) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(NamedNodeMap) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(NamedNodeMap) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMAttributeMap) diff --git a/content/base/src/nsDOMDocumentType.cpp b/content/base/src/nsDOMDocumentType.cpp index 3aea35f69c26..9cc6d364beb6 100644 --- a/content/base/src/nsDOMDocumentType.cpp +++ b/content/base/src/nsDOMDocumentType.cpp @@ -126,7 +126,7 @@ nsDOMDocumentType::~nsDOMDocumentType() NS_INTERFACE_TABLE_HEAD(nsDOMDocumentType) NS_NODE_INTERFACE_TABLE2(nsDOMDocumentType, nsIDOMNode, nsIDOMDocumentType) NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsDOMDocumentType) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(DocumentType) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DocumentType) NS_INTERFACE_MAP_END_INHERITING(nsGenericDOMDataNode) diff --git a/content/base/src/nsDOMFileReader.cpp b/content/base/src/nsDOMFileReader.cpp index 0993b03826d8..be87f3bb205d 100644 --- a/content/base/src/nsDOMFileReader.cpp +++ b/content/base/src/nsDOMFileReader.cpp @@ -117,7 +117,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMFileReader) NS_INTERFACE_MAP_ENTRY(nsIJSNativeInitializer) NS_INTERFACE_MAP_ENTRY(nsITimerCallback) NS_INTERFACE_MAP_ENTRY(nsICharsetDetectionObserver) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(FileReader) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(FileReader) NS_INTERFACE_MAP_END_INHERITING(nsXHREventTarget) NS_IMPL_ADDREF_INHERITED(nsDOMFileReader, nsXHREventTarget) diff --git a/content/base/src/nsDOMLists.cpp b/content/base/src/nsDOMLists.cpp index f0b869f5d2a4..305acabad5e0 100644 --- a/content/base/src/nsDOMLists.cpp +++ b/content/base/src/nsDOMLists.cpp @@ -63,7 +63,7 @@ NS_INTERFACE_TABLE_HEAD(nsDOMStringList) NS_INTERFACE_TABLE_ENTRY(nsDOMStringList, nsIDOMDOMStringList) NS_OFFSET_AND_INTERFACE_TABLE_END NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(DOMStringList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DOMStringList) NS_INTERFACE_MAP_END NS_IMETHODIMP @@ -110,7 +110,7 @@ NS_INTERFACE_TABLE_HEAD(nsNameList) NS_INTERFACE_TABLE_ENTRY(nsNameList, nsIDOMNameList) NS_OFFSET_AND_INTERFACE_TABLE_END NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(NameList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(NameList) NS_INTERFACE_MAP_END NS_IMETHODIMP diff --git a/content/base/src/nsDOMParser.cpp b/content/base/src/nsDOMParser.cpp index 5d3855cafd20..be0927bdcf56 100644 --- a/content/base/src/nsDOMParser.cpp +++ b/content/base/src/nsDOMParser.cpp @@ -126,7 +126,7 @@ NS_INTERFACE_MAP_BEGIN(nsDOMParser) NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsIJSNativeInitializer) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(DOMParser) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DOMParser) NS_INTERFACE_MAP_END diff --git a/content/base/src/nsDOMSerializer.cpp b/content/base/src/nsDOMSerializer.cpp index 8944c49c6145..a7b97de94c5b 100644 --- a/content/base/src/nsDOMSerializer.cpp +++ b/content/base/src/nsDOMSerializer.cpp @@ -63,7 +63,7 @@ nsDOMSerializer::~nsDOMSerializer() NS_INTERFACE_MAP_BEGIN(nsDOMSerializer) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_ENTRY(nsIDOMSerializer) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XMLSerializer) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XMLSerializer) NS_INTERFACE_MAP_END diff --git a/content/base/src/nsDOMTokenList.cpp b/content/base/src/nsDOMTokenList.cpp index 6c576b8cfa4c..d4f2e1cd4b55 100644 --- a/content/base/src/nsDOMTokenList.cpp +++ b/content/base/src/nsDOMTokenList.cpp @@ -61,7 +61,7 @@ NS_INTERFACE_TABLE_HEAD(nsDOMTokenList) NS_INTERFACE_TABLE1(nsDOMTokenList, nsIDOMDOMTokenList) NS_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(DOMTokenList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DOMTokenList) NS_INTERFACE_MAP_END NS_IMPL_ADDREF(nsDOMTokenList) diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index bb840eab0731..60f9b21c19b5 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -485,7 +485,7 @@ NS_INTERFACE_TABLE_HEAD(nsDOMStyleSheetList) nsIDocumentObserver, nsIMutationObserver) NS_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(StyleSheetList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(StyleSheetList) NS_INTERFACE_MAP_END @@ -1137,7 +1137,7 @@ NS_INTERFACE_TABLE_HEAD(nsDOMStyleSheetSetList) NS_INTERFACE_TABLE_ENTRY(nsDOMStyleSheetSetList, nsIDOMDOMStringList) NS_OFFSET_AND_INTERFACE_TABLE_END NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(DOMStringList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DOMStringList) NS_INTERFACE_MAP_END nsDOMStyleSheetSetList::nsDOMStyleSheetSetList(nsIDocument* aDocument) @@ -1274,7 +1274,7 @@ NS_INTERFACE_MAP_BEGIN(nsDOMImplementation) NS_INTERFACE_MAP_ENTRY(nsIDOMDOMImplementation) NS_INTERFACE_MAP_ENTRY(nsIPrivateDOMImplementation) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMDOMImplementation) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(DOMImplementation) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DOMImplementation) NS_INTERFACE_MAP_END diff --git a/content/base/src/nsDocumentFragment.cpp b/content/base/src/nsDocumentFragment.cpp index e29370f88d7d..9c47890b2d08 100644 --- a/content/base/src/nsDocumentFragment.cpp +++ b/content/base/src/nsDocumentFragment.cpp @@ -198,7 +198,7 @@ nsDocumentFragment::IsNodeOfType(PRUint32 aFlags) const NS_INTERFACE_TABLE_HEAD(nsDocumentFragment) NS_NODE_INTERFACE_TABLE2(nsDocumentFragment, nsIDOMNode, nsIDOMDocumentFragment) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(DocumentFragment) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DocumentFragment) NS_INTERFACE_MAP_END_INHERITING(nsGenericElement) diff --git a/content/base/src/nsFormData.cpp b/content/base/src/nsFormData.cpp index f8136fe46eab..52a68988e285 100644 --- a/content/base/src/nsFormData.cpp +++ b/content/base/src/nsFormData.cpp @@ -54,7 +54,7 @@ NS_IMPL_RELEASE(nsFormData) NS_INTERFACE_MAP_BEGIN(nsFormData) NS_INTERFACE_MAP_ENTRY(nsIDOMFormData) NS_INTERFACE_MAP_ENTRY(nsIXHRSendable) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(FormData) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(FormData) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFormData) NS_INTERFACE_MAP_END diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp index 822f17758e5a..1a91d3e5ce71 100644 --- a/content/base/src/nsGenericElement.cpp +++ b/content/base/src/nsGenericElement.cpp @@ -643,7 +643,7 @@ NS_INTERFACE_TABLE_HEAD(nsChildContentList) NS_INTERFACE_TABLE_ENTRY(nsChildContentList, nsIDOMNodeList) NS_OFFSET_AND_INTERFACE_TABLE_END NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(NodeList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(NodeList) NS_INTERFACE_MAP_END NS_IMETHODIMP diff --git a/content/base/src/nsNodeIterator.cpp b/content/base/src/nsNodeIterator.cpp index bcfb60f7c00a..d6e5b9ea2229 100644 --- a/content/base/src/nsNodeIterator.cpp +++ b/content/base/src/nsNodeIterator.cpp @@ -236,7 +236,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsNodeIterator) NS_INTERFACE_MAP_ENTRY(nsIDOMNodeIterator) NS_INTERFACE_MAP_ENTRY(nsIMutationObserver) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMNodeIterator) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(NodeIterator) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(NodeIterator) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsNodeIterator) diff --git a/content/base/src/nsRange.cpp b/content/base/src/nsRange.cpp index 77eb604f2fd8..ed623f422e06 100644 --- a/content/base/src/nsRange.cpp +++ b/content/base/src/nsRange.cpp @@ -245,7 +245,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsRange) NS_INTERFACE_MAP_ENTRY(nsIDOMNSRange) NS_INTERFACE_MAP_ENTRY(nsIMutationObserver) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIRange) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(Range) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Range) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsRange) diff --git a/content/base/src/nsTextNode.cpp b/content/base/src/nsTextNode.cpp index b319117446c6..61b4ed28ccff 100644 --- a/content/base/src/nsTextNode.cpp +++ b/content/base/src/nsTextNode.cpp @@ -158,7 +158,7 @@ NS_INTERFACE_TABLE_HEAD(nsTextNode) nsIDOMCharacterData) NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOM3Text, new nsText3Tearoff(this)) NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsTextNode) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(Text) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Text) NS_INTERFACE_MAP_END_INHERITING(nsGenericDOMDataNode) NS_IMETHODIMP diff --git a/content/base/src/nsTreeWalker.cpp b/content/base/src/nsTreeWalker.cpp index 7206ac308a5b..c644bc285bec 100644 --- a/content/base/src/nsTreeWalker.cpp +++ b/content/base/src/nsTreeWalker.cpp @@ -81,7 +81,7 @@ NS_IMPL_CYCLE_COLLECTION_3(nsTreeWalker, mFilter, mCurrentNode, mRoot) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsTreeWalker) NS_INTERFACE_MAP_ENTRY(nsIDOMTreeWalker) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMTreeWalker) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(TreeWalker) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(TreeWalker) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsTreeWalker) diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp index 65ec1e82fe0f..c1aed739858f 100644 --- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -619,7 +619,7 @@ nsXMLHttpRequestUpload::~nsXMLHttpRequestUpload() NS_INTERFACE_MAP_BEGIN(nsXMLHttpRequestUpload) NS_INTERFACE_MAP_ENTRY(nsIXMLHttpRequestUpload) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XMLHttpRequestUpload) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XMLHttpRequestUpload) NS_INTERFACE_MAP_END_INHERITING(nsXHREventTarget) NS_IMPL_ADDREF_INHERITED(nsXMLHttpRequestUpload, nsXHREventTarget) @@ -1025,7 +1025,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsXMLHttpRequest) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsIJSNativeInitializer) NS_INTERFACE_MAP_ENTRY(nsITimerCallback) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XMLHttpRequest) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XMLHttpRequest) NS_INTERFACE_MAP_END_INHERITING(nsXHREventTarget) NS_IMPL_ADDREF_INHERITED(nsXMLHttpRequest, nsXHREventTarget) @@ -3278,7 +3278,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXMLHttpProgressEvent) NS_INTERFACE_MAP_ENTRY(nsIPrivateDOMEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMProgressEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMLSProgressEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XMLHttpProgressEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XMLHttpProgressEvent) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXMLHttpProgressEvent) diff --git a/content/canvas/src/WebGLContext.cpp b/content/canvas/src/WebGLContext.cpp index abed9f9fa6de..7bd1803974fd 100644 --- a/content/canvas/src/WebGLContext.cpp +++ b/content/canvas/src/WebGLContext.cpp @@ -372,7 +372,7 @@ NS_INTERFACE_MAP_BEGIN(WebGLContext) NS_INTERFACE_MAP_ENTRY(nsICanvasRenderingContextInternal) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsICanvasRenderingContextWebGL) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CanvasRenderingContextWebGL) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CanvasRenderingContextWebGL) NS_INTERFACE_MAP_END NS_IMPL_ADDREF(WebGLBuffer) @@ -381,7 +381,7 @@ NS_IMPL_RELEASE(WebGLBuffer) NS_INTERFACE_MAP_BEGIN(WebGLBuffer) NS_INTERFACE_MAP_ENTRY(nsIWebGLBuffer) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(WebGLBuffer) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(WebGLBuffer) NS_INTERFACE_MAP_END NS_IMPL_ADDREF(WebGLTexture) @@ -390,7 +390,7 @@ NS_IMPL_RELEASE(WebGLTexture) NS_INTERFACE_MAP_BEGIN(WebGLTexture) NS_INTERFACE_MAP_ENTRY(nsIWebGLTexture) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(WebGLTexture) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(WebGLTexture) NS_INTERFACE_MAP_END NS_IMPL_ADDREF(WebGLProgram) @@ -399,7 +399,7 @@ NS_IMPL_RELEASE(WebGLProgram) NS_INTERFACE_MAP_BEGIN(WebGLProgram) NS_INTERFACE_MAP_ENTRY(nsIWebGLProgram) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(WebGLProgram) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(WebGLProgram) NS_INTERFACE_MAP_END NS_IMPL_ADDREF(WebGLShader) @@ -408,7 +408,7 @@ NS_IMPL_RELEASE(WebGLShader) NS_INTERFACE_MAP_BEGIN(WebGLShader) NS_INTERFACE_MAP_ENTRY(nsIWebGLShader) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(WebGLShader) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(WebGLShader) NS_INTERFACE_MAP_END NS_IMPL_ADDREF(WebGLFramebuffer) @@ -417,7 +417,7 @@ NS_IMPL_RELEASE(WebGLFramebuffer) NS_INTERFACE_MAP_BEGIN(WebGLFramebuffer) NS_INTERFACE_MAP_ENTRY(nsIWebGLFramebuffer) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(WebGLFramebuffer) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(WebGLFramebuffer) NS_INTERFACE_MAP_END NS_IMPL_ADDREF(WebGLRenderbuffer) @@ -426,7 +426,7 @@ NS_IMPL_RELEASE(WebGLRenderbuffer) NS_INTERFACE_MAP_BEGIN(WebGLRenderbuffer) NS_INTERFACE_MAP_ENTRY(nsIWebGLRenderbuffer) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(WebGLRenderbuffer) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(WebGLRenderbuffer) NS_INTERFACE_MAP_END /* [noscript] attribute GLuint name; */ diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp index 65c3023ec10a..d221b8ebd4de 100644 --- a/content/canvas/src/nsCanvasRenderingContext2D.cpp +++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp @@ -211,7 +211,7 @@ NS_IMPL_RELEASE(nsCanvasGradient) NS_INTERFACE_MAP_BEGIN(nsCanvasGradient) NS_INTERFACE_MAP_ENTRY(nsCanvasGradient) NS_INTERFACE_MAP_ENTRY(nsIDOMCanvasGradient) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CanvasGradient) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CanvasGradient) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_END @@ -257,7 +257,7 @@ NS_IMPL_RELEASE(nsCanvasPattern) NS_INTERFACE_MAP_BEGIN(nsCanvasPattern) NS_INTERFACE_MAP_ENTRY(nsCanvasPattern) NS_INTERFACE_MAP_ENTRY(nsIDOMCanvasPattern) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CanvasPattern) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CanvasPattern) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_END @@ -294,7 +294,7 @@ NS_IMPL_RELEASE(nsTextMetrics) NS_INTERFACE_MAP_BEGIN(nsTextMetrics) NS_INTERFACE_MAP_ENTRY(nsTextMetrics) NS_INTERFACE_MAP_ENTRY(nsIDOMTextMetrics) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(TextMetrics) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(TextMetrics) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_END @@ -656,7 +656,7 @@ NS_INTERFACE_MAP_BEGIN(nsCanvasRenderingContext2D) NS_INTERFACE_MAP_ENTRY(nsIDOMCanvasRenderingContext2D) NS_INTERFACE_MAP_ENTRY(nsICanvasRenderingContextInternal) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMCanvasRenderingContext2D) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CanvasRenderingContext2D) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CanvasRenderingContext2D) NS_INTERFACE_MAP_END /** diff --git a/content/events/src/nsDOMBeforeUnloadEvent.cpp b/content/events/src/nsDOMBeforeUnloadEvent.cpp index b1e789e111c9..6aac21936c67 100644 --- a/content/events/src/nsDOMBeforeUnloadEvent.cpp +++ b/content/events/src/nsDOMBeforeUnloadEvent.cpp @@ -44,7 +44,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMBeforeUnloadEvent, nsDOMEvent) NS_INTERFACE_MAP_BEGIN(nsDOMBeforeUnloadEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMBeforeUnloadEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(BeforeUnloadEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(BeforeUnloadEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent) NS_IMETHODIMP diff --git a/content/events/src/nsDOMCommandEvent.cpp b/content/events/src/nsDOMCommandEvent.cpp index bd47d02a0c85..96b2607c06f0 100644 --- a/content/events/src/nsDOMCommandEvent.cpp +++ b/content/events/src/nsDOMCommandEvent.cpp @@ -61,7 +61,7 @@ nsDOMCommandEvent::~nsDOMCommandEvent() NS_INTERFACE_MAP_BEGIN(nsDOMCommandEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMCommandEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CommandEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CommandEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent) NS_IMPL_ADDREF_INHERITED(nsDOMCommandEvent, nsDOMEvent) diff --git a/content/events/src/nsDOMDataContainerEvent.cpp b/content/events/src/nsDOMDataContainerEvent.cpp index bdaf0a34c8d9..f8c6fc6714ec 100644 --- a/content/events/src/nsDOMDataContainerEvent.cpp +++ b/content/events/src/nsDOMDataContainerEvent.cpp @@ -65,7 +65,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMDataContainerEvent, nsDOMEvent) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMDataContainerEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMDataContainerEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(DataContainerEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DataContainerEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent) NS_IMETHODIMP diff --git a/content/events/src/nsDOMDragEvent.cpp b/content/events/src/nsDOMDragEvent.cpp index c037060f282a..b875e2836ba1 100644 --- a/content/events/src/nsDOMDragEvent.cpp +++ b/content/events/src/nsDOMDragEvent.cpp @@ -72,7 +72,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMDragEvent, nsDOMMouseEvent) NS_INTERFACE_MAP_BEGIN(nsDOMDragEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMDragEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(DragEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DragEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMMouseEvent) NS_IMETHODIMP diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp index 26b927a4607b..480465d6b99d 100644 --- a/content/events/src/nsDOMEvent.cpp +++ b/content/events/src/nsDOMEvent.cpp @@ -168,7 +168,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMNSEvent) NS_INTERFACE_MAP_ENTRY(nsIPrivateDOMEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(Event) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Event) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMEvent) diff --git a/content/events/src/nsDOMKeyboardEvent.cpp b/content/events/src/nsDOMKeyboardEvent.cpp index e2c417755b03..be85b0708e32 100644 --- a/content/events/src/nsDOMKeyboardEvent.cpp +++ b/content/events/src/nsDOMKeyboardEvent.cpp @@ -69,7 +69,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMKeyboardEvent, nsDOMUIEvent) NS_INTERFACE_MAP_BEGIN(nsDOMKeyboardEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMKeyEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(KeyboardEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(KeyboardEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMUIEvent) NS_IMETHODIMP diff --git a/content/events/src/nsDOMMessageEvent.cpp b/content/events/src/nsDOMMessageEvent.cpp index df3c5c77070d..547f766110a2 100644 --- a/content/events/src/nsDOMMessageEvent.cpp +++ b/content/events/src/nsDOMMessageEvent.cpp @@ -51,7 +51,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMMessageEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMMessageEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(MessageEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MessageEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent) NS_IMPL_ADDREF_INHERITED(nsDOMMessageEvent, nsDOMEvent) diff --git a/content/events/src/nsDOMMouseEvent.cpp b/content/events/src/nsDOMMouseEvent.cpp index d6234ee1421f..75d5aa758739 100644 --- a/content/events/src/nsDOMMouseEvent.cpp +++ b/content/events/src/nsDOMMouseEvent.cpp @@ -94,7 +94,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMMouseEvent, nsDOMUIEvent) NS_INTERFACE_MAP_BEGIN(nsDOMMouseEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMMouseEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMNSMouseEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(MouseEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MouseEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMUIEvent) NS_IMETHODIMP diff --git a/content/events/src/nsDOMMouseScrollEvent.cpp b/content/events/src/nsDOMMouseScrollEvent.cpp index 2293f65c906f..d2eee90e144a 100644 --- a/content/events/src/nsDOMMouseScrollEvent.cpp +++ b/content/events/src/nsDOMMouseScrollEvent.cpp @@ -81,7 +81,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMMouseScrollEvent, nsDOMMouseEvent) NS_INTERFACE_MAP_BEGIN(nsDOMMouseScrollEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMMouseScrollEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(MouseScrollEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MouseScrollEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMMouseEvent) NS_IMETHODIMP diff --git a/content/events/src/nsDOMMutationEvent.cpp b/content/events/src/nsDOMMutationEvent.cpp index 179795925b6f..c6d2323741bc 100644 --- a/content/events/src/nsDOMMutationEvent.cpp +++ b/content/events/src/nsDOMMutationEvent.cpp @@ -61,7 +61,7 @@ nsDOMMutationEvent::~nsDOMMutationEvent() NS_INTERFACE_MAP_BEGIN(nsDOMMutationEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMMutationEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(MutationEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MutationEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent) NS_IMPL_ADDREF_INHERITED(nsDOMMutationEvent, nsDOMEvent) diff --git a/content/events/src/nsDOMNotifyPaintEvent.cpp b/content/events/src/nsDOMNotifyPaintEvent.cpp index 1bd87b9aee98..0ba2cc8d21bb 100644 --- a/content/events/src/nsDOMNotifyPaintEvent.cpp +++ b/content/events/src/nsDOMNotifyPaintEvent.cpp @@ -58,7 +58,7 @@ nsDOMNotifyPaintEvent::nsDOMNotifyPaintEvent(nsPresContext* aPresContext, NS_INTERFACE_MAP_BEGIN(nsDOMNotifyPaintEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMNotifyPaintEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(NotifyPaintEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(NotifyPaintEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent) NS_IMPL_ADDREF_INHERITED(nsDOMNotifyPaintEvent, nsDOMEvent) diff --git a/content/events/src/nsDOMOrientationEvent.cpp b/content/events/src/nsDOMOrientationEvent.cpp index 3b1149e502e1..1c352fbc796c 100644 --- a/content/events/src/nsDOMOrientationEvent.cpp +++ b/content/events/src/nsDOMOrientationEvent.cpp @@ -42,7 +42,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMOrientationEvent, nsDOMEvent) NS_INTERFACE_MAP_BEGIN(nsDOMOrientationEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMOrientationEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(OrientationEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(OrientationEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent) NS_IMETHODIMP nsDOMOrientationEvent::InitOrientationEvent(const nsAString & eventTypeArg, diff --git a/content/events/src/nsDOMPageTransitionEvent.cpp b/content/events/src/nsDOMPageTransitionEvent.cpp index 976ff9586715..5d0650810144 100644 --- a/content/events/src/nsDOMPageTransitionEvent.cpp +++ b/content/events/src/nsDOMPageTransitionEvent.cpp @@ -41,7 +41,7 @@ NS_INTERFACE_MAP_BEGIN(nsDOMPageTransitionEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMPageTransitionEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(PageTransitionEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(PageTransitionEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent) NS_IMPL_ADDREF_INHERITED(nsDOMPageTransitionEvent, nsDOMEvent) diff --git a/content/events/src/nsDOMPopStateEvent.cpp b/content/events/src/nsDOMPopStateEvent.cpp index 8ffdeb2b1ae8..6d4c0fb0d14d 100644 --- a/content/events/src/nsDOMPopStateEvent.cpp +++ b/content/events/src/nsDOMPopStateEvent.cpp @@ -50,7 +50,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMPopStateEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMPopStateEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(PopStateEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(PopStateEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent) nsDOMPopStateEvent::~nsDOMPopStateEvent() diff --git a/content/events/src/nsDOMPopupBlockedEvent.cpp b/content/events/src/nsDOMPopupBlockedEvent.cpp index c927ec45bf73..cccfc2900b46 100644 --- a/content/events/src/nsDOMPopupBlockedEvent.cpp +++ b/content/events/src/nsDOMPopupBlockedEvent.cpp @@ -46,7 +46,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMPopupBlockedEvent, nsDOMEvent) NS_INTERFACE_MAP_BEGIN(nsDOMPopupBlockedEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMPopupBlockedEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(PopupBlockedEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(PopupBlockedEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent) NS_IMETHODIMP diff --git a/content/events/src/nsDOMProgressEvent.cpp b/content/events/src/nsDOMProgressEvent.cpp index 1a9c6e06fe92..86449b1cfafa 100644 --- a/content/events/src/nsDOMProgressEvent.cpp +++ b/content/events/src/nsDOMProgressEvent.cpp @@ -42,7 +42,7 @@ NS_INTERFACE_MAP_BEGIN(nsDOMProgressEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMProgressEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(ProgressEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ProgressEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent) NS_IMPL_ADDREF_INHERITED(nsDOMProgressEvent, nsDOMEvent) diff --git a/content/events/src/nsDOMScrollAreaEvent.cpp b/content/events/src/nsDOMScrollAreaEvent.cpp index db1c1283f4d2..585d07b5b9b1 100644 --- a/content/events/src/nsDOMScrollAreaEvent.cpp +++ b/content/events/src/nsDOMScrollAreaEvent.cpp @@ -61,7 +61,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMScrollAreaEvent, nsDOMUIEvent) NS_INTERFACE_MAP_BEGIN(nsDOMScrollAreaEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMScrollAreaEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(ScrollAreaEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ScrollAreaEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMUIEvent) diff --git a/content/events/src/nsDOMSimpleGestureEvent.cpp b/content/events/src/nsDOMSimpleGestureEvent.cpp index b57c0149f927..c9d05b6986f6 100644 --- a/content/events/src/nsDOMSimpleGestureEvent.cpp +++ b/content/events/src/nsDOMSimpleGestureEvent.cpp @@ -67,7 +67,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMSimpleGestureEvent, nsDOMUIEvent) NS_INTERFACE_MAP_BEGIN(nsDOMSimpleGestureEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMSimpleGestureEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SimpleGestureEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SimpleGestureEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMMouseEvent) /* readonly attribute unsigned long direction; */ diff --git a/content/events/src/nsDOMTransitionEvent.cpp b/content/events/src/nsDOMTransitionEvent.cpp index 5b1876cfb00a..426916d4cefd 100644 --- a/content/events/src/nsDOMTransitionEvent.cpp +++ b/content/events/src/nsDOMTransitionEvent.cpp @@ -64,7 +64,7 @@ nsDOMTransitionEvent::~nsDOMTransitionEvent() NS_INTERFACE_MAP_BEGIN(nsDOMTransitionEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMTransitionEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(TransitionEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(TransitionEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent) NS_IMPL_ADDREF_INHERITED(nsDOMTransitionEvent, nsDOMEvent) diff --git a/content/events/src/nsDOMUIEvent.cpp b/content/events/src/nsDOMUIEvent.cpp index 9ee045e227b8..8e9c299f33bd 100644 --- a/content/events/src/nsDOMUIEvent.cpp +++ b/content/events/src/nsDOMUIEvent.cpp @@ -118,7 +118,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMUIEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMUIEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMNSUIEvent) NS_INTERFACE_MAP_ENTRY(nsIPrivateCompositionEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(UIEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(UIEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent) nsIntPoint diff --git a/content/events/src/nsDOMXULCommandEvent.cpp b/content/events/src/nsDOMXULCommandEvent.cpp index 35cda0172863..dfa16541c354 100644 --- a/content/events/src/nsDOMXULCommandEvent.cpp +++ b/content/events/src/nsDOMXULCommandEvent.cpp @@ -70,7 +70,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMXULCommandEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMXULCommandEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XULCommandEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XULCommandEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMUIEvent) NS_IMETHODIMP diff --git a/content/events/src/nsEventListenerService.cpp b/content/events/src/nsEventListenerService.cpp index e15112b18ec2..31f0d8909b1a 100644 --- a/content/events/src/nsEventListenerService.cpp +++ b/content/events/src/nsEventListenerService.cpp @@ -60,7 +60,7 @@ NS_IMPL_CYCLE_COLLECTION_1(nsEventListenerInfo, mListener) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsEventListenerInfo) NS_INTERFACE_MAP_ENTRY(nsIEventListenerInfo) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(EventListenerInfo) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(EventListenerInfo) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsEventListenerInfo) diff --git a/content/events/src/nsPaintRequest.cpp b/content/events/src/nsPaintRequest.cpp index e28fa982d54b..fa7a02fc4b1f 100644 --- a/content/events/src/nsPaintRequest.cpp +++ b/content/events/src/nsPaintRequest.cpp @@ -45,7 +45,7 @@ NS_INTERFACE_TABLE_HEAD(nsPaintRequest) NS_INTERFACE_TABLE1(nsPaintRequest, nsIDOMPaintRequest) NS_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(PaintRequest) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(PaintRequest) NS_INTERFACE_MAP_END NS_IMPL_ADDREF(nsPaintRequest) @@ -82,7 +82,7 @@ nsPaintRequest::GetReason(nsAString& aResult) NS_INTERFACE_TABLE_HEAD(nsPaintRequestList) NS_INTERFACE_TABLE1(nsPaintRequestList, nsIDOMPaintRequestList) NS_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(PaintRequestList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(PaintRequestList) NS_INTERFACE_MAP_END NS_IMPL_ADDREF(nsPaintRequestList) diff --git a/content/html/content/src/nsClientRect.cpp b/content/html/content/src/nsClientRect.cpp index a9e3e83ded5b..dedb2e4a8a2f 100644 --- a/content/html/content/src/nsClientRect.cpp +++ b/content/html/content/src/nsClientRect.cpp @@ -45,7 +45,7 @@ NS_INTERFACE_TABLE_HEAD(nsClientRect) NS_INTERFACE_TABLE1(nsClientRect, nsIDOMClientRect) NS_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(ClientRect) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ClientRect) NS_INTERFACE_MAP_END NS_IMPL_ADDREF(nsClientRect) @@ -101,7 +101,7 @@ nsClientRect::GetHeight(float* aResult) NS_INTERFACE_TABLE_HEAD(nsClientRectList) NS_INTERFACE_TABLE1(nsClientRectList, nsIDOMClientRectList) NS_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(ClientRectList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ClientRectList) NS_INTERFACE_MAP_END NS_IMPL_ADDREF(nsClientRectList) diff --git a/content/html/content/src/nsGenericHTMLElement.h b/content/html/content/src/nsGenericHTMLElement.h index efe3c56c2d8d..fdb6b290380c 100644 --- a/content/html/content/src/nsGenericHTMLElement.h +++ b/content/html/content/src/nsGenericHTMLElement.h @@ -1098,7 +1098,7 @@ NS_NewHTML##_elementName##Element(nsINodeInfo *aNodeInfo, PRBool aFromParser)\ NS_ELEMENT_INTERFACE_MAP_END #define NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(_class) \ - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(_class) \ + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(_class) \ NS_HTML_CONTENT_INTERFACE_MAP_END #define NS_INTERFACE_MAP_ENTRY_IF_TAG(_interface, _tag) \ @@ -1106,7 +1106,7 @@ NS_NewHTML##_elementName##Element(nsINodeInfo *aNodeInfo, PRBool aFromParser)\ mNodeInfo->Equals(nsGkAtoms::_tag)) -#define NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(_class, _tag) \ +#define NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(_class, _tag) \ if (mNodeInfo->Equals(nsGkAtoms::_tag) && \ aIID.Equals(NS_GET_IID(nsIClassInfo))) { \ foundInterface = NS_GetDOMClassInfoInstance(eDOMClassInfo_##_class##_id); \ diff --git a/content/html/content/src/nsHTMLDelElement.cpp b/content/html/content/src/nsHTMLDelElement.cpp index 21ee05ffeec7..60b676495ced 100644 --- a/content/html/content/src/nsHTMLDelElement.cpp +++ b/content/html/content/src/nsHTMLDelElement.cpp @@ -89,8 +89,8 @@ NS_INTERFACE_TABLE_HEAD(nsHTMLModElement) NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLModElement, nsIDOMHTMLModElement) NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLModElement, nsGenericHTMLElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLDelElement, del) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLInsElement, ins) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLDelElement, del) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLInsElement, ins) NS_HTML_CONTENT_INTERFACE_MAP_END diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp index 79829e79cdf6..a6d0d7a53e7c 100644 --- a/content/html/content/src/nsHTMLFormElement.cpp +++ b/content/html/content/src/nsHTMLFormElement.cpp @@ -1881,7 +1881,7 @@ NS_INTERFACE_TABLE_HEAD(nsFormControlList) nsIHTMLCollection, nsIDOMHTMLCollection) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsFormControlList) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(HTMLCollection) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(HTMLCollection) NS_INTERFACE_MAP_END diff --git a/content/html/content/src/nsHTMLMediaError.cpp b/content/html/content/src/nsHTMLMediaError.cpp index 43878720ae98..5162d22f601b 100644 --- a/content/html/content/src/nsHTMLMediaError.cpp +++ b/content/html/content/src/nsHTMLMediaError.cpp @@ -44,7 +44,7 @@ NS_IMPL_RELEASE(nsHTMLMediaError) NS_INTERFACE_MAP_BEGIN(nsHTMLMediaError) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_ENTRY(nsIDOMHTMLMediaError) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(HTMLMediaError) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(HTMLMediaError) NS_INTERFACE_MAP_END nsHTMLMediaError::nsHTMLMediaError(PRUint16 aCode) : diff --git a/content/html/content/src/nsHTMLOListElement.cpp b/content/html/content/src/nsHTMLOListElement.cpp index 5a1d3b8a67bf..67e1a3c35466 100644 --- a/content/html/content/src/nsHTMLOListElement.cpp +++ b/content/html/content/src/nsHTMLOListElement.cpp @@ -114,9 +114,9 @@ NS_INTERFACE_TABLE_HEAD(nsHTMLSharedListElement) NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLDListElement, dl) NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLUListElement, ul) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLOListElement, ol) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLDListElement, dl) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLUListElement, ul) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLOListElement, ol) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLDListElement, dl) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLUListElement, ul) NS_HTML_CONTENT_INTERFACE_MAP_END diff --git a/content/html/content/src/nsHTMLScriptElement.cpp b/content/html/content/src/nsHTMLScriptElement.cpp index 4436c5e7ce08..4780431c1f80 100644 --- a/content/html/content/src/nsHTMLScriptElement.cpp +++ b/content/html/content/src/nsHTMLScriptElement.cpp @@ -391,7 +391,7 @@ NS_INTERFACE_TABLE_HEAD(nsHTMLScriptElement) foundInterface = static_cast (mScriptEventHandler); else - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(HTMLScriptElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(HTMLScriptElement) NS_HTML_CONTENT_INTERFACE_MAP_END diff --git a/content/html/content/src/nsHTMLSelectElement.cpp b/content/html/content/src/nsHTMLSelectElement.cpp index 2f27eca73eba..29e714054415 100644 --- a/content/html/content/src/nsHTMLSelectElement.cpp +++ b/content/html/content/src/nsHTMLSelectElement.cpp @@ -1816,7 +1816,7 @@ NS_INTERFACE_TABLE_HEAD(nsHTMLOptionCollection) nsIDOMHTMLOptionsCollection, nsIDOMHTMLCollection) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsHTMLOptionCollection) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(HTMLOptionsCollection) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(HTMLOptionsCollection) NS_INTERFACE_MAP_END diff --git a/content/html/content/src/nsHTMLSharedElement.cpp b/content/html/content/src/nsHTMLSharedElement.cpp index 76de6488c59c..cafb0180bd7a 100644 --- a/content/html/content/src/nsHTMLSharedElement.cpp +++ b/content/html/content/src/nsHTMLSharedElement.cpp @@ -163,16 +163,16 @@ NS_INTERFACE_TABLE_HEAD(nsHTMLSharedElement) NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLQuoteElement, blockquote) NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLBaseFontElement, basefont) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLParamElement, param) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLWBRElement, wbr) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLIsIndexElement, isindex) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLBaseElement, base) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLSpacerElement, spacer) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLDirectoryElement, dir) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLMenuElement, menu) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLQuoteElement, q) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLQuoteElement, blockquote) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLBaseFontElement, basefont) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLParamElement, param) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLWBRElement, wbr) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLIsIndexElement, isindex) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLBaseElement, base) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLSpacerElement, spacer) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLDirectoryElement, dir) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLMenuElement, menu) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLQuoteElement, q) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLQuoteElement, blockquote) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLBaseFontElement, basefont) NS_HTML_CONTENT_INTERFACE_MAP_END diff --git a/content/html/content/src/nsHTMLSharedObjectElement.cpp b/content/html/content/src/nsHTMLSharedObjectElement.cpp index 686af5d9085e..e41133f6a44a 100644 --- a/content/html/content/src/nsHTMLSharedObjectElement.cpp +++ b/content/html/content/src/nsHTMLSharedObjectElement.cpp @@ -238,8 +238,8 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLSharedObjectElement) #ifdef MOZ_SVG NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMGetSVGDocument, embed) #endif - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLAppletElement, applet) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO_IF_TAG(HTMLEmbedElement, embed) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLAppletElement, applet) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_IF_TAG(HTMLEmbedElement, embed) NS_HTML_CONTENT_INTERFACE_MAP_END NS_IMPL_ELEMENT_CLONE(nsHTMLSharedObjectElement) diff --git a/content/html/content/src/nsHTMLSpanElement.cpp b/content/html/content/src/nsHTMLSpanElement.cpp index 40e08025548d..3e223d3ca24a 100644 --- a/content/html/content/src/nsHTMLSpanElement.cpp +++ b/content/html/content/src/nsHTMLSpanElement.cpp @@ -132,7 +132,7 @@ public: }; NS_INTERFACE_MAP_BEGIN(nsHTMLUnknownElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(HTMLUnknownElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(HTMLUnknownElement) NS_INTERFACE_MAP_END_INHERITING(nsHTMLSpanElement) nsHTMLUnknownElement::nsHTMLUnknownElement(nsINodeInfo *aNodeInfo) diff --git a/content/html/content/src/nsHTMLTableElement.cpp b/content/html/content/src/nsHTMLTableElement.cpp index b41266a53542..292e7550142c 100644 --- a/content/html/content/src/nsHTMLTableElement.cpp +++ b/content/html/content/src/nsHTMLTableElement.cpp @@ -158,7 +158,7 @@ NS_INTERFACE_TABLE_HEAD(TableRowsCollection) NS_INTERFACE_TABLE2(TableRowsCollection, nsIHTMLCollection, nsIDOMHTMLCollection) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(TableRowsCollection) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(HTMLCollection) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(HTMLCollection) NS_INTERFACE_MAP_END nsresult diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp index ea19e787f8f7..29b288ee64ff 100644 --- a/content/html/document/src/nsHTMLDocument.cpp +++ b/content/html/document/src/nsHTMLDocument.cpp @@ -280,7 +280,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLDocument) NS_INTERFACE_TABLE_ENTRY(nsHTMLDocument, nsIDOMNSHTMLDocument) NS_OFFSET_AND_INTERFACE_TABLE_END NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(HTMLDocument) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(HTMLDocument) NS_INTERFACE_MAP_END_INHERITING(nsDocument) diff --git a/content/html/document/src/nsImageDocument.cpp b/content/html/document/src/nsImageDocument.cpp index 26ca3c704a1f..930b07a9cea0 100644 --- a/content/html/document/src/nsImageDocument.cpp +++ b/content/html/document/src/nsImageDocument.cpp @@ -307,7 +307,7 @@ NS_INTERFACE_TABLE_HEAD(nsImageDocument) NS_INTERFACE_TABLE_ENTRY(nsImageDocument, nsIDOMEventListener) NS_OFFSET_AND_INTERFACE_TABLE_END NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(ImageDocument) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ImageDocument) NS_INTERFACE_MAP_END_INHERITING(nsMediaDocument) diff --git a/content/mathml/content/src/nsMathMLElement.cpp b/content/mathml/content/src/nsMathMLElement.cpp index 20a1f215c8fc..62754a81e2ff 100644 --- a/content/mathml/content/src/nsMathMLElement.cpp +++ b/content/mathml/content/src/nsMathMLElement.cpp @@ -61,7 +61,7 @@ NS_INTERFACE_TABLE_HEAD(nsMathMLElement) NS_INTERFACE_TABLE_ENTRY(nsMathMLElement, nsIDOMElement) NS_OFFSET_AND_INTERFACE_TABLE_END NS_ELEMENT_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(MathMLElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MathMLElement) NS_ELEMENT_INTERFACE_MAP_END NS_IMPL_ADDREF_INHERITED(nsMathMLElement, nsMathMLElementBase) diff --git a/content/svg/content/src/nsDOMSVGEvent.cpp b/content/svg/content/src/nsDOMSVGEvent.cpp index 8d25c9fd7dff..2f4ed5f3957b 100644 --- a/content/svg/content/src/nsDOMSVGEvent.cpp +++ b/content/svg/content/src/nsDOMSVGEvent.cpp @@ -69,7 +69,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMSVGEvent, nsDOMEvent) NS_INTERFACE_MAP_BEGIN(nsDOMSVGEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent) diff --git a/content/svg/content/src/nsDOMSVGZoomEvent.cpp b/content/svg/content/src/nsDOMSVGZoomEvent.cpp index 893821396f6e..402f24f0dd72 100644 --- a/content/svg/content/src/nsDOMSVGZoomEvent.cpp +++ b/content/svg/content/src/nsDOMSVGZoomEvent.cpp @@ -110,7 +110,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMSVGZoomEvent, nsDOMUIEvent) NS_INTERFACE_MAP_BEGIN(nsDOMSVGZoomEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGZoomEvent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGZoomEvent) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGZoomEvent) NS_INTERFACE_MAP_END_INHERITING(nsDOMUIEvent) diff --git a/content/svg/content/src/nsSVGAElement.cpp b/content/svg/content/src/nsSVGAElement.cpp index bf37574e7579..5aa338b672e8 100644 --- a/content/svg/content/src/nsSVGAElement.cpp +++ b/content/svg/content/src/nsSVGAElement.cpp @@ -68,7 +68,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGAElement) nsIDOMSVGAElement, nsILink, Link) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGAElementBase) diff --git a/content/svg/content/src/nsSVGAngle.cpp b/content/svg/content/src/nsSVGAngle.cpp index 2815815cc42a..1f8873d3ae59 100644 --- a/content/svg/content/src/nsSVGAngle.cpp +++ b/content/svg/content/src/nsSVGAngle.cpp @@ -122,25 +122,25 @@ NS_IMPL_RELEASE(DOMSVGAngle) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGAngle::DOMBaseVal) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAngle) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAngle) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAngle) NS_INTERFACE_MAP_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGAngle::DOMAnimVal) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAngle) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAngle) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAngle) NS_INTERFACE_MAP_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGAngle::DOMAnimatedAngle) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedAngle) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimatedAngle) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimatedAngle) NS_INTERFACE_MAP_END NS_INTERFACE_MAP_BEGIN(DOMSVGAngle) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAngle) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAngle) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAngle) NS_INTERFACE_MAP_END static nsIAtom** const unitMap[] = diff --git a/content/svg/content/src/nsSVGAnimateElement.cpp b/content/svg/content/src/nsSVGAnimateElement.cpp index 0469299f7fb8..a8fcc537afd4 100644 --- a/content/svg/content/src/nsSVGAnimateElement.cpp +++ b/content/svg/content/src/nsSVGAnimateElement.cpp @@ -80,7 +80,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGAnimateElement) NS_NODE_INTERFACE_TABLE5(nsSVGAnimateElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGAnimationElement, nsIDOMSVGAnimateElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimateElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimateElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGAnimateElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGAnimateTransformElement.cpp b/content/svg/content/src/nsSVGAnimateTransformElement.cpp index b3db7b8bdb1c..34cf3041593f 100644 --- a/content/svg/content/src/nsSVGAnimateTransformElement.cpp +++ b/content/svg/content/src/nsSVGAnimateTransformElement.cpp @@ -94,7 +94,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGAnimateTransformElement) nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGAnimationElement, nsIDOMSVGAnimateTransformElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimateTransformElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimateTransformElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGAnimateTransformElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGAnimatedLengthList.cpp b/content/svg/content/src/nsSVGAnimatedLengthList.cpp index a9fdac70ed4d..97328ab4300e 100644 --- a/content/svg/content/src/nsSVGAnimatedLengthList.cpp +++ b/content/svg/content/src/nsSVGAnimatedLengthList.cpp @@ -119,7 +119,7 @@ NS_INTERFACE_MAP_BEGIN(nsSVGAnimatedLengthList) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedLengthList) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsISVGValueObserver) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimatedLengthList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimatedLengthList) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISVGValue) NS_INTERFACE_MAP_END diff --git a/content/svg/content/src/nsSVGAnimatedNumberList.cpp b/content/svg/content/src/nsSVGAnimatedNumberList.cpp index 2f91eca76712..e3791586b816 100644 --- a/content/svg/content/src/nsSVGAnimatedNumberList.cpp +++ b/content/svg/content/src/nsSVGAnimatedNumberList.cpp @@ -119,7 +119,7 @@ NS_INTERFACE_MAP_BEGIN(nsSVGAnimatedNumberList) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedNumberList) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsISVGValueObserver) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimatedNumberList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimatedNumberList) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISVGValue) NS_INTERFACE_MAP_END diff --git a/content/svg/content/src/nsSVGAnimatedTransformList.cpp b/content/svg/content/src/nsSVGAnimatedTransformList.cpp index fb5f37479bfa..c341a6a29c10 100644 --- a/content/svg/content/src/nsSVGAnimatedTransformList.cpp +++ b/content/svg/content/src/nsSVGAnimatedTransformList.cpp @@ -72,7 +72,7 @@ NS_INTERFACE_MAP_BEGIN(nsSVGAnimatedTransformList) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedTransformList) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsISVGValueObserver) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimatedTransformList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimatedTransformList) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISVGValue) NS_INTERFACE_MAP_END diff --git a/content/svg/content/src/nsSVGBoolean.cpp b/content/svg/content/src/nsSVGBoolean.cpp index 929d557c67b8..fb57ee75de61 100644 --- a/content/svg/content/src/nsSVGBoolean.cpp +++ b/content/svg/content/src/nsSVGBoolean.cpp @@ -50,7 +50,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsSVGBoolean::DOMAnimatedBoolean) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGBoolean::DOMAnimatedBoolean) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedBoolean) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimatedBoolean) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimatedBoolean) NS_INTERFACE_MAP_END /* Implementation */ diff --git a/content/svg/content/src/nsSVGCircleElement.cpp b/content/svg/content/src/nsSVGCircleElement.cpp index 933c765de650..fb7690782b73 100644 --- a/content/svg/content/src/nsSVGCircleElement.cpp +++ b/content/svg/content/src/nsSVGCircleElement.cpp @@ -95,7 +95,7 @@ NS_IMPL_RELEASE_INHERITED(nsSVGCircleElement,nsSVGCircleElementBase) NS_INTERFACE_TABLE_HEAD(nsSVGCircleElement) NS_NODE_INTERFACE_TABLE4(nsSVGCircleElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGCircleElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGCircleElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGCircleElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGCircleElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGClipPathElement.cpp b/content/svg/content/src/nsSVGClipPathElement.cpp index 894e87b69203..3f30fb47050a 100644 --- a/content/svg/content/src/nsSVGClipPathElement.cpp +++ b/content/svg/content/src/nsSVGClipPathElement.cpp @@ -57,7 +57,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGClipPathElement) NS_NODE_INTERFACE_TABLE5(nsSVGClipPathElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGClipPathElement, nsIDOMSVGUnitTypes) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGClipPathElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGClipPathElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGClipPathElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGDefsElement.cpp b/content/svg/content/src/nsSVGDefsElement.cpp index 52dc7c544938..9833310bb72d 100644 --- a/content/svg/content/src/nsSVGDefsElement.cpp +++ b/content/svg/content/src/nsSVGDefsElement.cpp @@ -82,7 +82,7 @@ NS_IMPL_RELEASE_INHERITED(nsSVGDefsElement,nsSVGDefsElementBase) NS_INTERFACE_TABLE_HEAD(nsSVGDefsElement) NS_NODE_INTERFACE_TABLE4(nsSVGDefsElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGDefsElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGDefsElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGDefsElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGDefsElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGDescElement.cpp b/content/svg/content/src/nsSVGDescElement.cpp index c2d65cc4f147..7397d46edd2e 100644 --- a/content/svg/content/src/nsSVGDescElement.cpp +++ b/content/svg/content/src/nsSVGDescElement.cpp @@ -76,7 +76,7 @@ NS_IMPL_RELEASE_INHERITED(nsSVGDescElement, nsSVGDescElementBase) NS_INTERFACE_TABLE_HEAD(nsSVGDescElement) NS_NODE_INTERFACE_TABLE4(nsSVGDescElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGDescElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGDescElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGDescElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGDescElementBase) diff --git a/content/svg/content/src/nsSVGEllipseElement.cpp b/content/svg/content/src/nsSVGEllipseElement.cpp index 87cc9c81e80e..14217f17975f 100644 --- a/content/svg/content/src/nsSVGEllipseElement.cpp +++ b/content/svg/content/src/nsSVGEllipseElement.cpp @@ -97,7 +97,7 @@ NS_IMPL_RELEASE_INHERITED(nsSVGEllipseElement,nsSVGEllipseElementBase) NS_INTERFACE_TABLE_HEAD(nsSVGEllipseElement) NS_NODE_INTERFACE_TABLE4(nsSVGEllipseElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGEllipseElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGEllipseElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGEllipseElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGEllipseElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGEnum.cpp b/content/svg/content/src/nsSVGEnum.cpp index a2da346ffc46..1afa7fa64fe3 100644 --- a/content/svg/content/src/nsSVGEnum.cpp +++ b/content/svg/content/src/nsSVGEnum.cpp @@ -52,7 +52,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsSVGEnum::DOMAnimatedEnum) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGEnum::DOMAnimatedEnum) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedEnumeration) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimatedEnumeration) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimatedEnumeration) NS_INTERFACE_MAP_END nsSVGEnumMapping * diff --git a/content/svg/content/src/nsSVGFilterElement.cpp b/content/svg/content/src/nsSVGFilterElement.cpp index 5ae5e093bab4..19e5189796fa 100644 --- a/content/svg/content/src/nsSVGFilterElement.cpp +++ b/content/svg/content/src/nsSVGFilterElement.cpp @@ -82,7 +82,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFilterElement) NS_NODE_INTERFACE_TABLE5(nsSVGFilterElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGFilterElement, nsIDOMSVGURIReference) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFilterElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFilterElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFilterElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGFilters.cpp b/content/svg/content/src/nsSVGFilters.cpp index c9edc01271c6..1a0de510edde 100644 --- a/content/svg/content/src/nsSVGFilters.cpp +++ b/content/svg/content/src/nsSVGFilters.cpp @@ -435,7 +435,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEGaussianBlurElement) nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGFilterPrimitiveStandardAttributes, nsIDOMSVGFEGaussianBlurElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEGaussianBlurElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEGaussianBlurElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFEGaussianBlurElementBase) //---------------------------------------------------------------------- @@ -909,7 +909,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEBlendElement) nsIDOMSVGElement, nsIDOMSVGFilterPrimitiveStandardAttributes, nsIDOMSVGFEBlendElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEBlendElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEBlendElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFEBlendElementBase) //---------------------------------------------------------------------- @@ -1110,7 +1110,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEColorMatrixElement) nsIDOMSVGElement, nsIDOMSVGFilterPrimitiveStandardAttributes, nsIDOMSVGFEColorMatrixElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEColorMatrixElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEColorMatrixElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFEColorMatrixElementBase) //---------------------------------------------------------------------- @@ -1448,7 +1448,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFECompositeElement) nsIDOMSVGElement, nsIDOMSVGFilterPrimitiveStandardAttributes, nsIDOMSVGFECompositeElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFECompositeElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFECompositeElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFECompositeElementBase) //---------------------------------------------------------------------- @@ -1707,7 +1707,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEComponentTransferElement) nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGFilterPrimitiveStandardAttributes, nsIDOMSVGFEComponentTransferElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEComponentTransferElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEComponentTransferElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFEComponentTransferElementBase) //---------------------------------------------------------------------- @@ -2092,7 +2092,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEFuncRElement) nsIDOMSVGElement, nsIDOMSVGComponentTransferFunctionElement, nsIDOMSVGFEFuncRElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEFuncRElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEFuncRElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGComponentTransferFunctionElement) NS_IMPL_NS_NEW_SVG_ELEMENT(FEFuncR) @@ -2133,7 +2133,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEFuncGElement) nsIDOMSVGElement, nsIDOMSVGComponentTransferFunctionElement, nsIDOMSVGFEFuncGElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEFuncGElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEFuncGElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGComponentTransferFunctionElement) NS_IMPL_NS_NEW_SVG_ELEMENT(FEFuncG) @@ -2174,7 +2174,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEFuncBElement) nsIDOMSVGElement, nsIDOMSVGComponentTransferFunctionElement, nsIDOMSVGFEFuncBElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEFuncBElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEFuncBElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGComponentTransferFunctionElement) NS_IMPL_NS_NEW_SVG_ELEMENT(FEFuncB) @@ -2215,7 +2215,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEFuncAElement) nsIDOMSVGElement, nsIDOMSVGComponentTransferFunctionElement, nsIDOMSVGFEFuncAElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEFuncAElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEFuncAElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGComponentTransferFunctionElement) NS_IMPL_NS_NEW_SVG_ELEMENT(FEFuncA) @@ -2327,7 +2327,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEMergeElement) nsIDOMSVGElement, nsIDOMSVGFilterPrimitiveStandardAttributes, nsIDOMSVGFEMergeElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEMergeElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEMergeElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFEMergeElementBase) //---------------------------------------------------------------------- @@ -2400,7 +2400,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEMergeNodeElement) if ( aIID.Equals(NS_GET_IID(nsSVGFEMergeNodeElement)) ) foundInterface = static_cast(static_cast(this)); else - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEMergeNodeElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEMergeNodeElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFEMergeNodeElementBase) //---------------------------------------------------------------------- @@ -2510,7 +2510,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEOffsetElement) nsIDOMSVGElement, nsIDOMSVGFilterPrimitiveStandardAttributes, nsIDOMSVGFEOffsetElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEOffsetElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEOffsetElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFEOffsetElementBase) //---------------------------------------------------------------------- @@ -2698,7 +2698,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEFloodElement) nsIDOMSVGElement, nsIDOMSVGFilterPrimitiveStandardAttributes, nsIDOMSVGFEFloodElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEFloodElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEFloodElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFEFloodElementBase) //---------------------------------------------------------------------- @@ -2837,7 +2837,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFETileElement) nsIDOMSVGElement, nsIDOMSVGFilterPrimitiveStandardAttributes, nsIDOMSVGFETileElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFETileElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFETileElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFETileElementBase) //---------------------------------------------------------------------- @@ -3141,7 +3141,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFETurbulenceElement) nsIDOMSVGElement, nsIDOMSVGFilterPrimitiveStandardAttributes, nsIDOMSVGFETurbulenceElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFETurbulenceElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFETurbulenceElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFETurbulenceElementBase) //---------------------------------------------------------------------- @@ -3577,7 +3577,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEMorphologyElement) nsIDOMSVGElement, nsIDOMSVGFilterPrimitiveStandardAttributes, nsIDOMSVGFEMorphologyElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEMorphologyElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEMorphologyElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFEMorphologyElementBase) //---------------------------------------------------------------------- @@ -3931,7 +3931,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEConvolveMatrixElement) nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGFilterPrimitiveStandardAttributes, nsIDOMSVGFEConvolveMatrixElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEConvolveMatrixElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEConvolveMatrixElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFEConvolveMatrixElementBase) //---------------------------------------------------------------------- @@ -4323,7 +4323,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEDistantLightElement) NS_NODE_INTERFACE_TABLE4(nsSVGFEDistantLightElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGFEDistantLightElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEDistantLightElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEDistantLightElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFEDistantLightElementBase) //---------------------------------------------------------------------- @@ -4409,7 +4409,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEPointLightElement) NS_NODE_INTERFACE_TABLE4(nsSVGFEPointLightElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGFEPointLightElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEPointLightElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEPointLightElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFEPointLightElementBase) //---------------------------------------------------------------------- @@ -4505,7 +4505,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFESpotLightElement) NS_NODE_INTERFACE_TABLE4(nsSVGFESpotLightElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGFESpotLightElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFESpotLightElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFESpotLightElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFESpotLightElementBase) //---------------------------------------------------------------------- @@ -4979,7 +4979,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEDiffuseLightingElement) nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGFilterPrimitiveStandardAttributes, nsIDOMSVGFEDiffuseLightingElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEDiffuseLightingElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEDiffuseLightingElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFEDiffuseLightingElementBase) //---------------------------------------------------------------------- @@ -5101,7 +5101,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFESpecularLightingElement) nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGFilterPrimitiveStandardAttributes, nsIDOMSVGFESpecularLightingElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFESpecularLightingElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFESpecularLightingElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFESpecularLightingElementBase) //---------------------------------------------------------------------- @@ -5310,7 +5310,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEImageElement) nsIDOMSVGFilterPrimitiveStandardAttributes, nsIDOMSVGFEImageElement, nsIDOMSVGURIReference, imgIDecoderObserver, nsIImageLoadingContent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEImageElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEImageElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFEImageElementBase) //---------------------------------------------------------------------- @@ -5682,7 +5682,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGFEDisplacementMapElement) nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGFilterPrimitiveStandardAttributes, nsIDOMSVGFEDisplacementMapElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEDisplacementMapElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFEDisplacementMapElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGFEDisplacementMapElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGForeignObjectElement.cpp b/content/svg/content/src/nsSVGForeignObjectElement.cpp index b8a977a9b938..ecc06897278c 100644 --- a/content/svg/content/src/nsSVGForeignObjectElement.cpp +++ b/content/svg/content/src/nsSVGForeignObjectElement.cpp @@ -59,7 +59,7 @@ NS_IMPL_RELEASE_INHERITED(nsSVGForeignObjectElement,nsSVGForeignObjectElementBas NS_INTERFACE_TABLE_HEAD(nsSVGForeignObjectElement) NS_NODE_INTERFACE_TABLE4(nsSVGForeignObjectElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGForeignObjectElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGForeignObjectElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGForeignObjectElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGForeignObjectElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGGElement.cpp b/content/svg/content/src/nsSVGGElement.cpp index 8537dafe1a92..f8609d46a9d3 100644 --- a/content/svg/content/src/nsSVGGElement.cpp +++ b/content/svg/content/src/nsSVGGElement.cpp @@ -82,7 +82,7 @@ NS_IMPL_RELEASE_INHERITED(nsSVGGElement,nsSVGGElementBase) NS_INTERFACE_TABLE_HEAD(nsSVGGElement) NS_NODE_INTERFACE_TABLE4(nsSVGGElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGGElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGGElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGGElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGGElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGGradientElement.cpp b/content/svg/content/src/nsSVGGradientElement.cpp index 288412a6d182..0a5694e573bf 100644 --- a/content/svg/content/src/nsSVGGradientElement.cpp +++ b/content/svg/content/src/nsSVGGradientElement.cpp @@ -202,7 +202,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGLinearGradientElement) nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGGradientElement, nsIDOMSVGLinearGradientElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGLinearGradientElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGLinearGradientElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGLinearGradientElementBase) //---------------------------------------------------------------------- @@ -280,7 +280,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGRadialGradientElement) nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGGradientElement, nsIDOMSVGRadialGradientElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGRadialGradientElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGRadialGradientElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGRadialGradientElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGImageElement.cpp b/content/svg/content/src/nsSVGImageElement.cpp index aca2959a6753..a600870036f8 100644 --- a/content/svg/content/src/nsSVGImageElement.cpp +++ b/content/svg/content/src/nsSVGImageElement.cpp @@ -70,7 +70,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGImageElement) nsIDOMSVGElement, nsIDOMSVGImageElement, nsIDOMSVGURIReference, imgIDecoderObserver, nsIImageLoadingContent) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGImageElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGImageElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGImageElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGInteger.cpp b/content/svg/content/src/nsSVGInteger.cpp index 3ff806c2c5b3..6455b6ad1a75 100644 --- a/content/svg/content/src/nsSVGInteger.cpp +++ b/content/svg/content/src/nsSVGInteger.cpp @@ -50,7 +50,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsSVGInteger::DOMAnimatedInteger) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGInteger::DOMAnimatedInteger) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedInteger) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimatedInteger) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimatedInteger) NS_INTERFACE_MAP_END /* Implementation */ diff --git a/content/svg/content/src/nsSVGLength.cpp b/content/svg/content/src/nsSVGLength.cpp index 3aa1fbb88476..19b8ca24eaf9 100644 --- a/content/svg/content/src/nsSVGLength.cpp +++ b/content/svg/content/src/nsSVGLength.cpp @@ -154,7 +154,7 @@ NS_INTERFACE_MAP_BEGIN(nsSVGLength) NS_INTERFACE_MAP_ENTRY(nsISVGValue) NS_INTERFACE_MAP_ENTRY(nsISVGLength) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGLength) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGLength) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGLength) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISVGValue) NS_INTERFACE_MAP_END diff --git a/content/svg/content/src/nsSVGLength2.cpp b/content/svg/content/src/nsSVGLength2.cpp index 66225e76adfa..7bf3f7aa9c81 100644 --- a/content/svg/content/src/nsSVGLength2.cpp +++ b/content/svg/content/src/nsSVGLength2.cpp @@ -67,19 +67,19 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsSVGLength2::DOMAnimatedLength) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGLength2::DOMBaseVal) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGLength) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGLength) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGLength) NS_INTERFACE_MAP_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGLength2::DOMAnimVal) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGLength) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGLength) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGLength) NS_INTERFACE_MAP_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGLength2::DOMAnimatedLength) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedLength) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimatedLength) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimatedLength) NS_INTERFACE_MAP_END static nsIAtom** const unitMap[] = diff --git a/content/svg/content/src/nsSVGLengthList.cpp b/content/svg/content/src/nsSVGLengthList.cpp index d51bb5f37c06..bb6bccf443c3 100644 --- a/content/svg/content/src/nsSVGLengthList.cpp +++ b/content/svg/content/src/nsSVGLengthList.cpp @@ -124,7 +124,7 @@ NS_INTERFACE_MAP_BEGIN(nsSVGLengthList) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGLengthList) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsISVGValueObserver) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGLengthList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGLengthList) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISVGValue) NS_INTERFACE_MAP_END diff --git a/content/svg/content/src/nsSVGLineElement.cpp b/content/svg/content/src/nsSVGLineElement.cpp index 371c8a1df624..06b2a3620249 100644 --- a/content/svg/content/src/nsSVGLineElement.cpp +++ b/content/svg/content/src/nsSVGLineElement.cpp @@ -101,7 +101,7 @@ NS_IMPL_RELEASE_INHERITED(nsSVGLineElement,nsSVGLineElementBase) NS_INTERFACE_TABLE_HEAD(nsSVGLineElement) NS_NODE_INTERFACE_TABLE4(nsSVGLineElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGLineElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGLineElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGLineElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGLineElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGMarkerElement.cpp b/content/svg/content/src/nsSVGMarkerElement.cpp index da444ac7d53a..049d528518d2 100644 --- a/content/svg/content/src/nsSVGMarkerElement.cpp +++ b/content/svg/content/src/nsSVGMarkerElement.cpp @@ -84,7 +84,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsSVGOrientType::DOMAnimatedEnum) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGOrientType::DOMAnimatedEnum) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedEnumeration) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimatedEnumeration) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimatedEnumeration) NS_INTERFACE_MAP_END NS_IMPL_ADDREF_INHERITED(nsSVGMarkerElement,nsSVGMarkerElementBase) @@ -94,7 +94,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGMarkerElement) NS_NODE_INTERFACE_TABLE5(nsSVGMarkerElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGFitToViewBox, nsIDOMSVGMarkerElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGMarkerElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGMarkerElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGMarkerElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGMaskElement.cpp b/content/svg/content/src/nsSVGMaskElement.cpp index 5984ba9f00b6..0052eccfb736 100644 --- a/content/svg/content/src/nsSVGMaskElement.cpp +++ b/content/svg/content/src/nsSVGMaskElement.cpp @@ -72,7 +72,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGMaskElement) NS_NODE_INTERFACE_TABLE5(nsSVGMaskElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGMaskElement, nsIDOMSVGUnitTypes) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGMaskElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGMaskElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGMaskElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGMatrix.cpp b/content/svg/content/src/nsSVGMatrix.cpp index 80a286245859..ee155e5aa7ac 100644 --- a/content/svg/content/src/nsSVGMatrix.cpp +++ b/content/svg/content/src/nsSVGMatrix.cpp @@ -108,7 +108,7 @@ NS_INTERFACE_MAP_BEGIN(nsSVGMatrix) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGMatrix) // NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) // NS_INTERFACE_MAP_ENTRY(nsISVGValueObserver) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGMatrix) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGMatrix) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISVGValue) NS_INTERFACE_MAP_END diff --git a/content/svg/content/src/nsSVGMetadataElement.cpp b/content/svg/content/src/nsSVGMetadataElement.cpp index f4532cb1d2cc..241edbc3ee27 100644 --- a/content/svg/content/src/nsSVGMetadataElement.cpp +++ b/content/svg/content/src/nsSVGMetadataElement.cpp @@ -76,7 +76,7 @@ NS_IMPL_RELEASE_INHERITED(nsSVGMetadataElement, nsSVGMetadataElementBase) NS_INTERFACE_TABLE_HEAD(nsSVGMetadataElement) NS_NODE_INTERFACE_TABLE4(nsSVGMetadataElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGMetadataElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGMetadataElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGMetadataElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGMetadataElementBase) diff --git a/content/svg/content/src/nsSVGNumber.cpp b/content/svg/content/src/nsSVGNumber.cpp index fbb0abcef88a..6f2967af8f83 100644 --- a/content/svg/content/src/nsSVGNumber.cpp +++ b/content/svg/content/src/nsSVGNumber.cpp @@ -96,7 +96,7 @@ NS_IMPL_RELEASE(nsSVGNumber) NS_INTERFACE_MAP_BEGIN(nsSVGNumber) NS_INTERFACE_MAP_ENTRY(nsISVGValue) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGNumber) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGNumber) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGNumber) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISVGValue) NS_INTERFACE_MAP_END diff --git a/content/svg/content/src/nsSVGNumber2.cpp b/content/svg/content/src/nsSVGNumber2.cpp index 2188003cd20f..d472ab97527a 100644 --- a/content/svg/content/src/nsSVGNumber2.cpp +++ b/content/svg/content/src/nsSVGNumber2.cpp @@ -73,13 +73,13 @@ NS_IMPL_RELEASE(DOMSVGNumber) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGNumber2::DOMAnimatedNumber) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedNumber) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimatedNumber) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimatedNumber) NS_INTERFACE_MAP_END NS_INTERFACE_MAP_BEGIN(DOMSVGNumber) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGNumber) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGNumber) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGNumber) NS_INTERFACE_MAP_END /* Implementation */ diff --git a/content/svg/content/src/nsSVGNumberList.cpp b/content/svg/content/src/nsSVGNumberList.cpp index 7980e55a230a..794bce4c994c 100644 --- a/content/svg/content/src/nsSVGNumberList.cpp +++ b/content/svg/content/src/nsSVGNumberList.cpp @@ -117,7 +117,7 @@ NS_INTERFACE_MAP_BEGIN(nsSVGNumberList) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGNumberList) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsISVGValueObserver) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGNumberList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGNumberList) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISVGValue) NS_INTERFACE_MAP_END diff --git a/content/svg/content/src/nsSVGPathElement.cpp b/content/svg/content/src/nsSVGPathElement.cpp index 67ed1851abaf..a22c00a18ffb 100644 --- a/content/svg/content/src/nsSVGPathElement.cpp +++ b/content/svg/content/src/nsSVGPathElement.cpp @@ -64,7 +64,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGPathElement) NS_NODE_INTERFACE_TABLE5(nsSVGPathElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGPathElement, nsIDOMSVGAnimatedPathData) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGPathElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGPathElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGPathElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGPathSeg.cpp b/content/svg/content/src/nsSVGPathSeg.cpp index 148f39f8ba43..98cfc02840ca 100644 --- a/content/svg/content/src/nsSVGPathSeg.cpp +++ b/content/svg/content/src/nsSVGPathSeg.cpp @@ -70,7 +70,7 @@ NS_IMPL_RELEASE(ns##basename) \ \ NS_INTERFACE_MAP_BEGIN(ns##basename) \ NS_INTERFACE_MAP_ENTRY(nsIDOM##basename) \ - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(basename) \ + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(basename) \ NS_INTERFACE_MAP_END_INHERITING(nsSVGPathSeg) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGPathSegList.cpp b/content/svg/content/src/nsSVGPathSegList.cpp index 0e3c1c5dc1aa..b878764244af 100644 --- a/content/svg/content/src/nsSVGPathSegList.cpp +++ b/content/svg/content/src/nsSVGPathSegList.cpp @@ -120,7 +120,7 @@ NS_INTERFACE_MAP_BEGIN(nsSVGPathSegList) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGPathSegList) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsISVGValueObserver) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGPathSegList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGPathSegList) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISVGValue) NS_INTERFACE_MAP_END diff --git a/content/svg/content/src/nsSVGPatternElement.cpp b/content/svg/content/src/nsSVGPatternElement.cpp index afb8bb95d823..88a593000d4e 100644 --- a/content/svg/content/src/nsSVGPatternElement.cpp +++ b/content/svg/content/src/nsSVGPatternElement.cpp @@ -83,7 +83,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGPatternElement) nsIDOMSVGElement, nsIDOMSVGFitToViewBox, nsIDOMSVGURIReference, nsIDOMSVGPatternElement, nsIDOMSVGUnitTypes) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGPatternElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGPatternElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGPatternElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGPoint.cpp b/content/svg/content/src/nsSVGPoint.cpp index 7c9a95c6caad..c29cbd68f7f9 100644 --- a/content/svg/content/src/nsSVGPoint.cpp +++ b/content/svg/content/src/nsSVGPoint.cpp @@ -98,7 +98,7 @@ NS_IMPL_RELEASE(nsSVGPoint) NS_INTERFACE_MAP_BEGIN(nsSVGPoint) NS_INTERFACE_MAP_ENTRY(nsISVGValue) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGPoint) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGPoint) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGPoint) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISVGValue) NS_INTERFACE_MAP_END diff --git a/content/svg/content/src/nsSVGPointList.cpp b/content/svg/content/src/nsSVGPointList.cpp index 44856845fc8b..dbdd6a17485a 100644 --- a/content/svg/content/src/nsSVGPointList.cpp +++ b/content/svg/content/src/nsSVGPointList.cpp @@ -149,7 +149,7 @@ NS_INTERFACE_MAP_BEGIN(nsSVGPointList) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGPointList) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsISVGValueObserver) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGPointList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGPointList) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISVGValue) NS_INTERFACE_MAP_END diff --git a/content/svg/content/src/nsSVGPolygonElement.cpp b/content/svg/content/src/nsSVGPolygonElement.cpp index 1f413855dde6..1ac7e44df962 100644 --- a/content/svg/content/src/nsSVGPolygonElement.cpp +++ b/content/svg/content/src/nsSVGPolygonElement.cpp @@ -79,7 +79,7 @@ NS_IMPL_RELEASE_INHERITED(nsSVGPolygonElement,nsSVGPolygonElementBase) NS_INTERFACE_TABLE_HEAD(nsSVGPolygonElement) NS_NODE_INTERFACE_TABLE4(nsSVGPolygonElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGPolygonElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGPolygonElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGPolygonElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGPolygonElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGPolylineElement.cpp b/content/svg/content/src/nsSVGPolylineElement.cpp index 5407c3415a5f..8c4a49f63b36 100644 --- a/content/svg/content/src/nsSVGPolylineElement.cpp +++ b/content/svg/content/src/nsSVGPolylineElement.cpp @@ -75,7 +75,7 @@ NS_IMPL_RELEASE_INHERITED(nsSVGPolylineElement,nsSVGPolylineElementBase) NS_INTERFACE_TABLE_HEAD(nsSVGPolylineElement) NS_NODE_INTERFACE_TABLE4(nsSVGPolylineElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGPolylineElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGPolylineElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGPolylineElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGPolylineElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGPreserveAspectRatio.cpp b/content/svg/content/src/nsSVGPreserveAspectRatio.cpp index 1a308030de85..41f1253a1a72 100644 --- a/content/svg/content/src/nsSVGPreserveAspectRatio.cpp +++ b/content/svg/content/src/nsSVGPreserveAspectRatio.cpp @@ -67,19 +67,19 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsSVGPreserveAspectRatio::DOMAnimPAspectRatio) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGPreserveAspectRatio::DOMBaseVal) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGPreserveAspectRatio) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGPreserveAspectRatio) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGPreserveAspectRatio) NS_INTERFACE_MAP_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGPreserveAspectRatio::DOMAnimVal) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGPreserveAspectRatio) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGPreserveAspectRatio) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGPreserveAspectRatio) NS_INTERFACE_MAP_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGPreserveAspectRatio::DOMAnimPAspectRatio) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedPreserveAspectRatio) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimatedPreserveAspectRatio) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimatedPreserveAspectRatio) NS_INTERFACE_MAP_END /* Implementation */ diff --git a/content/svg/content/src/nsSVGRect.cpp b/content/svg/content/src/nsSVGRect.cpp index 6c4fb0d2a0df..08ac386588c0 100644 --- a/content/svg/content/src/nsSVGRect.cpp +++ b/content/svg/content/src/nsSVGRect.cpp @@ -64,7 +64,7 @@ NS_IMPL_RELEASE(nsSVGRect) NS_INTERFACE_MAP_BEGIN(nsSVGRect) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGRect) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGRect) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGRect) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_END diff --git a/content/svg/content/src/nsSVGRectElement.cpp b/content/svg/content/src/nsSVGRectElement.cpp index a18a7c1f2196..6954971d0f76 100644 --- a/content/svg/content/src/nsSVGRectElement.cpp +++ b/content/svg/content/src/nsSVGRectElement.cpp @@ -98,7 +98,7 @@ NS_IMPL_RELEASE_INHERITED(nsSVGRectElement,nsSVGRectElementBase) NS_INTERFACE_TABLE_HEAD(nsSVGRectElement) NS_NODE_INTERFACE_TABLE4(nsSVGRectElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGRectElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGRectElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGRectElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGRectElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGSVGElement.cpp b/content/svg/content/src/nsSVGSVGElement.cpp index d2d01e30bd6f..8d6324dd6684 100644 --- a/content/svg/content/src/nsSVGSVGElement.cpp +++ b/content/svg/content/src/nsSVGSVGElement.cpp @@ -79,7 +79,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsSVGTranslatePoint::DOMVal) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGTranslatePoint::DOMVal) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGPoint) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGPoint) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGPoint) NS_INTERFACE_MAP_END nsresult @@ -185,7 +185,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGSVGElement) nsIDOMSVGElement, nsIDOMSVGSVGElement, nsIDOMSVGFitToViewBox, nsIDOMSVGLocatable, nsIDOMSVGZoomAndPan) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGSVGElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGSVGElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGSVGElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGScriptElement.cpp b/content/svg/content/src/nsSVGScriptElement.cpp index f2675adbc8f0..b69c478f2649 100644 --- a/content/svg/content/src/nsSVGScriptElement.cpp +++ b/content/svg/content/src/nsSVGScriptElement.cpp @@ -122,7 +122,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGScriptElement) nsIDOMSVGElement, nsIDOMSVGScriptElement, nsIDOMSVGURIReference, nsIScriptLoaderObserver, nsIScriptElement, nsIMutationObserver) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGScriptElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGScriptElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGScriptElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGSetElement.cpp b/content/svg/content/src/nsSVGSetElement.cpp index ccac6f425f45..b864c620d14c 100644 --- a/content/svg/content/src/nsSVGSetElement.cpp +++ b/content/svg/content/src/nsSVGSetElement.cpp @@ -81,7 +81,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGSetElement) NS_NODE_INTERFACE_TABLE5(nsSVGSetElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGAnimationElement, nsIDOMSVGSetElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGSetElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGSetElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGSetElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGStopElement.cpp b/content/svg/content/src/nsSVGStopElement.cpp index f9399cca71b2..956b0008facc 100644 --- a/content/svg/content/src/nsSVGStopElement.cpp +++ b/content/svg/content/src/nsSVGStopElement.cpp @@ -93,7 +93,7 @@ NS_IMPL_RELEASE_INHERITED(nsSVGStopElement,nsSVGStopElementBase) NS_INTERFACE_TABLE_HEAD(nsSVGStopElement) NS_NODE_INTERFACE_TABLE4(nsSVGStopElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGStopElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGStopElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGStopElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGStopElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGString.cpp b/content/svg/content/src/nsSVGString.cpp index dd427e7d6a5a..79004833b366 100644 --- a/content/svg/content/src/nsSVGString.cpp +++ b/content/svg/content/src/nsSVGString.cpp @@ -44,7 +44,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsSVGString::DOMAnimatedString) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGString::DOMAnimatedString) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedString) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimatedString) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimatedString) NS_INTERFACE_MAP_END /* Implementation */ diff --git a/content/svg/content/src/nsSVGStylableElement.cpp b/content/svg/content/src/nsSVGStylableElement.cpp index 9d741fafe25e..d66139a050ff 100644 --- a/content/svg/content/src/nsSVGStylableElement.cpp +++ b/content/svg/content/src/nsSVGStylableElement.cpp @@ -52,7 +52,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsSVGStylableElement::DOMAnimatedClassString) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGStylableElement::DOMAnimatedClassString) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedString) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimatedString) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimatedString) NS_INTERFACE_MAP_END NS_IMPL_ADDREF_INHERITED(nsSVGStylableElement, nsSVGStylableElementBase) diff --git a/content/svg/content/src/nsSVGStyleElement.cpp b/content/svg/content/src/nsSVGStyleElement.cpp index 9b3950bd58c9..4d37d9ce89d4 100644 --- a/content/svg/content/src/nsSVGStyleElement.cpp +++ b/content/svg/content/src/nsSVGStyleElement.cpp @@ -128,7 +128,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGStyleElement) nsIDOMSVGElement, nsIDOMSVGStyleElement, nsIDOMLinkStyle, nsIStyleSheetLinkingElement, nsIMutationObserver) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGStyleElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGStyleElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGStyleElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGSwitchElement.cpp b/content/svg/content/src/nsSVGSwitchElement.cpp index a359b84fd873..1d159f9a85a7 100644 --- a/content/svg/content/src/nsSVGSwitchElement.cpp +++ b/content/svg/content/src/nsSVGSwitchElement.cpp @@ -66,7 +66,7 @@ NS_IMPL_RELEASE_INHERITED(nsSVGSwitchElement,nsSVGSwitchElementBase) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsSVGSwitchElement) NS_NODE_INTERFACE_TABLE4(nsSVGSwitchElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGSwitchElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGSwitchElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGSwitchElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGSwitchElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGSymbolElement.cpp b/content/svg/content/src/nsSVGSymbolElement.cpp index 043d85ed58ed..a70e29541fdc 100644 --- a/content/svg/content/src/nsSVGSymbolElement.cpp +++ b/content/svg/content/src/nsSVGSymbolElement.cpp @@ -89,7 +89,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGSymbolElement) NS_NODE_INTERFACE_TABLE5(nsSVGSymbolElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGFitToViewBox, nsIDOMSVGSymbolElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGSymbolElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGSymbolElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGSymbolElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGTSpanElement.cpp b/content/svg/content/src/nsSVGTSpanElement.cpp index 274786360c69..08845fb0be01 100644 --- a/content/svg/content/src/nsSVGTSpanElement.cpp +++ b/content/svg/content/src/nsSVGTSpanElement.cpp @@ -109,7 +109,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGTSpanElement) nsIDOMSVGElement, nsIDOMSVGTSpanElement, nsIDOMSVGTextPositioningElement, nsIDOMSVGTextContentElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGTSpanElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGTSpanElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGTSpanElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGTextElement.cpp b/content/svg/content/src/nsSVGTextElement.cpp index 8d3824b5a719..5dc646716b0f 100644 --- a/content/svg/content/src/nsSVGTextElement.cpp +++ b/content/svg/content/src/nsSVGTextElement.cpp @@ -106,7 +106,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGTextElement) nsIDOMSVGElement, nsIDOMSVGTextElement, nsIDOMSVGTextPositioningElement, nsIDOMSVGTextContentElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGTextElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGTextElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGTextElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGTextPathElement.cpp b/content/svg/content/src/nsSVGTextPathElement.cpp index 3b12c4ea2700..f1718adb4dd1 100644 --- a/content/svg/content/src/nsSVGTextPathElement.cpp +++ b/content/svg/content/src/nsSVGTextPathElement.cpp @@ -89,7 +89,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGTextPathElement) NS_NODE_INTERFACE_TABLE6(nsSVGTextPathElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGTextPathElement, nsIDOMSVGTextContentElement, nsIDOMSVGURIReference) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGTextPathElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGTextPathElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGTextPathElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGTitleElement.cpp b/content/svg/content/src/nsSVGTitleElement.cpp index 74966768df4b..3ffe919a8af2 100644 --- a/content/svg/content/src/nsSVGTitleElement.cpp +++ b/content/svg/content/src/nsSVGTitleElement.cpp @@ -96,7 +96,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGTitleElement) NS_NODE_INTERFACE_TABLE5(nsSVGTitleElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGTitleElement, nsIMutationObserver) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGTitleElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGTitleElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGTitleElementBase) diff --git a/content/svg/content/src/nsSVGTransform.cpp b/content/svg/content/src/nsSVGTransform.cpp index 3b7fa63df311..26691f3bc1c1 100644 --- a/content/svg/content/src/nsSVGTransform.cpp +++ b/content/svg/content/src/nsSVGTransform.cpp @@ -98,7 +98,7 @@ NS_INTERFACE_MAP_BEGIN(nsSVGTransform) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGTransform) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsISVGValueObserver) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGTransform) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGTransform) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISVGValue) NS_INTERFACE_MAP_END diff --git a/content/svg/content/src/nsSVGTransformList.cpp b/content/svg/content/src/nsSVGTransformList.cpp index b4ee555986ea..458fe7e98905 100644 --- a/content/svg/content/src/nsSVGTransformList.cpp +++ b/content/svg/content/src/nsSVGTransformList.cpp @@ -157,7 +157,7 @@ NS_INTERFACE_MAP_BEGIN(nsSVGTransformList) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGTransformList) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsISVGValueObserver) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGTransformList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGTransformList) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISVGValue) NS_INTERFACE_MAP_END diff --git a/content/svg/content/src/nsSVGUseElement.cpp b/content/svg/content/src/nsSVGUseElement.cpp index 5cc673e19717..bdc294fb804f 100644 --- a/content/svg/content/src/nsSVGUseElement.cpp +++ b/content/svg/content/src/nsSVGUseElement.cpp @@ -86,7 +86,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsSVGUseElement) NS_NODE_INTERFACE_TABLE6(nsSVGUseElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIDOMSVGURIReference, nsIDOMSVGUseElement, nsIMutationObserver) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGUseElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGUseElement) if (aIID.Equals(NS_GET_IID(nsSVGUseElement))) foundInterface = reinterpret_cast(this); else diff --git a/content/svg/content/src/nsSVGViewBox.cpp b/content/svg/content/src/nsSVGViewBox.cpp index 9399a3c140f8..7214afb7ce0a 100644 --- a/content/svg/content/src/nsSVGViewBox.cpp +++ b/content/svg/content/src/nsSVGViewBox.cpp @@ -78,19 +78,19 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsSVGViewBox::DOMAnimatedRect) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGViewBox::DOMBaseVal) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGRect) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGRect) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGRect) NS_INTERFACE_MAP_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGViewBox::DOMAnimVal) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGRect) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGRect) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGRect) NS_INTERFACE_MAP_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGViewBox::DOMAnimatedRect) NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedRect) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimatedRect) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimatedRect) NS_INTERFACE_MAP_END /* Implementation of nsSVGViewBox methods */ diff --git a/content/svg/document/src/nsSVGDocument.cpp b/content/svg/document/src/nsSVGDocument.cpp index efada1260e78..4e18139d097e 100644 --- a/content/svg/document/src/nsSVGDocument.cpp +++ b/content/svg/document/src/nsSVGDocument.cpp @@ -62,7 +62,7 @@ NS_INTERFACE_TABLE_HEAD(nsSVGDocument) nsIDOMSVGDocument, nsIDOMDocumentEvent) NS_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGDocument) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGDocument) NS_INTERFACE_MAP_END_INHERITING(nsXMLDocument) NS_IMPL_ADDREF_INHERITED(nsSVGDocument, nsXMLDocument) diff --git a/content/xbl/src/nsBindingManager.cpp b/content/xbl/src/nsBindingManager.cpp index 048b9c72f33c..dd4d51b14b79 100644 --- a/content/xbl/src/nsBindingManager.cpp +++ b/content/xbl/src/nsBindingManager.cpp @@ -142,7 +142,7 @@ NS_INTERFACE_TABLE_HEAD(nsAnonymousContentList) NS_INTERFACE_TABLE_ENTRY(nsAnonymousContentList, nsAnonymousContentList) NS_OFFSET_AND_INTERFACE_TABLE_END NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(NodeList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(NodeList) NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsAnonymousContentList) NS_INTERFACE_MAP_END diff --git a/content/xml/content/src/nsXMLCDATASection.cpp b/content/xml/content/src/nsXMLCDATASection.cpp index 53532992ea52..3e0bb793b76a 100644 --- a/content/xml/content/src/nsXMLCDATASection.cpp +++ b/content/xml/content/src/nsXMLCDATASection.cpp @@ -111,7 +111,7 @@ NS_INTERFACE_TABLE_HEAD(nsXMLCDATASection) NS_NODE_INTERFACE_TABLE4(nsXMLCDATASection, nsIDOMNode, nsIDOMCharacterData, nsIDOMText, nsIDOMCDATASection) NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOM3Text, new nsText3Tearoff(this)) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CDATASection) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CDATASection) NS_INTERFACE_MAP_END_INHERITING(nsGenericDOMDataNode) NS_IMPL_ADDREF_INHERITED(nsXMLCDATASection, nsGenericDOMDataNode) diff --git a/content/xml/content/src/nsXMLElement.cpp b/content/xml/content/src/nsXMLElement.cpp index 13b6e22d1378..b4a598280f21 100644 --- a/content/xml/content/src/nsXMLElement.cpp +++ b/content/xml/content/src/nsXMLElement.cpp @@ -58,7 +58,7 @@ NS_INTERFACE_TABLE_HEAD(nsXMLElement) NS_INTERFACE_TABLE_ENTRY(nsXMLElement, nsIDOMElement) NS_OFFSET_AND_INTERFACE_TABLE_END NS_ELEMENT_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(Element) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Element) NS_ELEMENT_INTERFACE_MAP_END diff --git a/content/xml/content/src/nsXMLProcessingInstruction.cpp b/content/xml/content/src/nsXMLProcessingInstruction.cpp index 4b7454bc4c9e..53ae40dda93e 100644 --- a/content/xml/content/src/nsXMLProcessingInstruction.cpp +++ b/content/xml/content/src/nsXMLProcessingInstruction.cpp @@ -97,7 +97,7 @@ NS_INTERFACE_TABLE_HEAD(nsXMLProcessingInstruction) nsIDOMProcessingInstruction) NS_OFFSET_AND_INTERFACE_TABLE_END NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(ProcessingInstruction) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ProcessingInstruction) NS_INTERFACE_MAP_END_INHERITING(nsGenericDOMDataNode) diff --git a/content/xml/content/src/nsXMLStylesheetPI.cpp b/content/xml/content/src/nsXMLStylesheetPI.cpp index 7bbeff3acc91..bbee50c3d52b 100644 --- a/content/xml/content/src/nsXMLStylesheetPI.cpp +++ b/content/xml/content/src/nsXMLStylesheetPI.cpp @@ -93,7 +93,7 @@ NS_INTERFACE_TABLE_HEAD(nsXMLStylesheetPI) NS_NODE_INTERFACE_TABLE4(nsXMLStylesheetPI, nsIDOMNode, nsIDOMProcessingInstruction, nsIDOMLinkStyle, nsIStyleSheetLinkingElement) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XMLStylesheetProcessingInstruction) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XMLStylesheetProcessingInstruction) NS_INTERFACE_MAP_END_INHERITING(nsXMLProcessingInstruction) NS_IMPL_ADDREF_INHERITED(nsXMLStylesheetPI, nsXMLProcessingInstruction) diff --git a/content/xml/document/src/nsXMLDocument.cpp b/content/xml/document/src/nsXMLDocument.cpp index 9b79edd195ea..87037aed5c2c 100644 --- a/content/xml/document/src/nsXMLDocument.cpp +++ b/content/xml/document/src/nsXMLDocument.cpp @@ -239,7 +239,7 @@ NS_INTERFACE_TABLE_HEAD(nsXMLDocument) NS_INTERFACE_TABLE_ENTRY(nsXMLDocument, nsIDOMXMLDocument) NS_OFFSET_AND_INTERFACE_TABLE_END NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XMLDocument) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XMLDocument) NS_INTERFACE_MAP_END_INHERITING(nsDocument) diff --git a/content/xslt/src/xpath/nsXPathEvaluator.cpp b/content/xslt/src/xpath/nsXPathEvaluator.cpp index c8ebb5c234f9..d4271e4ed425 100644 --- a/content/xslt/src/xpath/nsXPathEvaluator.cpp +++ b/content/xslt/src/xpath/nsXPathEvaluator.cpp @@ -103,7 +103,7 @@ NS_IMPL_AGGREGATED(nsXPathEvaluator) NS_INTERFACE_MAP_BEGIN_AGGREGATED(nsXPathEvaluator) NS_INTERFACE_MAP_ENTRY(nsIDOMXPathEvaluator) NS_INTERFACE_MAP_ENTRY(nsIXPathEvaluatorInternal) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XPathEvaluator) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XPathEvaluator) NS_INTERFACE_MAP_END nsXPathEvaluator::nsXPathEvaluator(nsISupports *aOuter) diff --git a/content/xslt/src/xpath/nsXPathExpression.cpp b/content/xslt/src/xpath/nsXPathExpression.cpp index 21c39e789589..aaf0508a086d 100644 --- a/content/xslt/src/xpath/nsXPathExpression.cpp +++ b/content/xslt/src/xpath/nsXPathExpression.cpp @@ -59,7 +59,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXPathExpression) NS_INTERFACE_MAP_ENTRY(nsIDOMXPathExpression) NS_INTERFACE_MAP_ENTRY(nsIDOMNSXPathExpression) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMXPathExpression) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XPathExpression) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XPathExpression) NS_INTERFACE_MAP_END nsXPathExpression::nsXPathExpression(nsAutoPtr& aExpression, diff --git a/content/xslt/src/xpath/nsXPathNSResolver.cpp b/content/xslt/src/xpath/nsXPathNSResolver.cpp index a8740c4db20b..7f4dccabbf9d 100644 --- a/content/xslt/src/xpath/nsXPathNSResolver.cpp +++ b/content/xslt/src/xpath/nsXPathNSResolver.cpp @@ -48,7 +48,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXPathNSResolver) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXPathNSResolver) NS_INTERFACE_MAP_ENTRY(nsIDOMXPathNSResolver) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMXPathNSResolver) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XPathNSResolver) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XPathNSResolver) NS_INTERFACE_MAP_END nsXPathNSResolver::nsXPathNSResolver(nsIDOMNode* aNode) diff --git a/content/xslt/src/xpath/nsXPathNamespace.cpp b/content/xslt/src/xpath/nsXPathNamespace.cpp index 7dd47b4c262c..ad368b5b977a 100644 --- a/content/xslt/src/xpath/nsXPathNamespace.cpp +++ b/content/xslt/src/xpath/nsXPathNamespace.cpp @@ -45,7 +45,7 @@ NS_INTERFACE_MAP_BEGIN(nsXPathNamespace) NS_INTERFACE_MAP_ENTRY(nsIDOMXPathNamespace) NS_INTERFACE_MAP_ENTRY(nsIDOMNode) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMXPathNamespace) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XPathNamespace) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XPathNamespace) NS_INTERFACE_MAP_END /* readonly attribute DOMString nodeName; */ diff --git a/content/xslt/src/xpath/nsXPathResult.cpp b/content/xslt/src/xpath/nsXPathResult.cpp index e83723162800..02c9204c23cd 100644 --- a/content/xslt/src/xpath/nsXPathResult.cpp +++ b/content/xslt/src/xpath/nsXPathResult.cpp @@ -96,7 +96,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXPathResult) NS_INTERFACE_MAP_ENTRY(nsIMutationObserver) NS_INTERFACE_MAP_ENTRY(nsIXPathResult) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMXPathResult) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XPathResult) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XPathResult) NS_INTERFACE_MAP_END void diff --git a/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp b/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp index 6c7d770d6bfb..4b0562819c6e 100644 --- a/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp +++ b/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp @@ -319,7 +319,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(txMozillaXSLTProcessor) NS_INTERFACE_MAP_ENTRY(nsIMutationObserver) NS_INTERFACE_MAP_ENTRY(nsIJSNativeInitializer) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXSLTProcessor) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XSLTProcessor) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XSLTProcessor) NS_INTERFACE_MAP_END txMozillaXSLTProcessor::txMozillaXSLTProcessor() : mStylesheetDocument(nsnull), diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp index 27403436fc68..5dccf318e849 100644 --- a/content/xul/content/src/nsXULElement.cpp +++ b/content/xul/content/src/nsXULElement.cpp @@ -379,7 +379,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsXULElement) new nsXULElementTearoff(this)) NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIFrameLoaderOwner, new nsXULElementTearoff(this)) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XULElement) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XULElement) NS_ELEMENT_INTERFACE_MAP_END //---------------------------------------------------------------------- diff --git a/content/xul/document/src/nsXULCommandDispatcher.cpp b/content/xul/document/src/nsXULCommandDispatcher.cpp index 197480d4a9b2..6a7a0e0933e7 100644 --- a/content/xul/document/src/nsXULCommandDispatcher.cpp +++ b/content/xul/document/src/nsXULCommandDispatcher.cpp @@ -99,7 +99,7 @@ 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_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XULCommandDispatcher) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXULCommandDispatcher) diff --git a/content/xul/document/src/nsXULControllers.cpp b/content/xul/document/src/nsXULControllers.cpp index 878ecb417482..d6c17678a795 100644 --- a/content/xul/document/src/nsXULControllers.cpp +++ b/content/xul/document/src/nsXULControllers.cpp @@ -117,7 +117,7 @@ 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_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XULControllers) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsXULControllers, nsIControllers) diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp index 0e020612c942..194b846aca3d 100644 --- a/content/xul/document/src/nsXULDocument.cpp +++ b/content/xul/document/src/nsXULDocument.cpp @@ -391,7 +391,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsXULDocument) NS_INTERFACE_TABLE_ENTRY(nsXULDocument, nsICSSLoaderObserver) NS_OFFSET_AND_INTERFACE_TABLE_END NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XULDocument) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XULDocument) NS_INTERFACE_MAP_END_INHERITING(nsXMLDocument) diff --git a/layout/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp index d7b78bc08c51..e04c5f0c7bc2 100644 --- a/layout/generic/nsSelection.cpp +++ b/layout/generic/nsSelection.cpp @@ -3414,7 +3414,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsTypedSelection) NS_INTERFACE_MAP_ENTRY(nsISelectionPrivate) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISelection) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(Selection) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Selection) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsTypedSelection) diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp index 10c498d04c01..4c12530692fa 100644 --- a/layout/style/nsCSSRules.cpp +++ b/layout/style/nsCSSRules.cpp @@ -124,7 +124,7 @@ NS_INTERFACE_MAP_BEGIN(CSSGroupRuleRuleListImpl) NS_INTERFACE_MAP_ENTRY(nsICSSRuleList) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRuleList) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSGroupRuleRuleList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSGroupRuleRuleList) NS_INTERFACE_MAP_END @@ -242,7 +242,7 @@ NS_INTERFACE_MAP_BEGIN(CSSCharsetRuleImpl) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSCharsetRule) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsICSSRule) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSCharsetRule) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSCharsetRule) NS_INTERFACE_MAP_END IMPL_STYLE_RULE_INHERIT(CSSCharsetRuleImpl, nsCSSRule) @@ -444,7 +444,7 @@ NS_INTERFACE_MAP_BEGIN(CSSImportRuleImpl) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSImportRule) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsICSSImportRule) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSImportRule) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSImportRule) NS_INTERFACE_MAP_END IMPL_STYLE_RULE_INHERIT(CSSImportRuleImpl, nsCSSRule) @@ -924,7 +924,7 @@ NS_INTERFACE_MAP_BEGIN(nsCSSMediaRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSMediaRule) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsCSSGroupRule) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSMediaRule) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSMediaRule) NS_INTERFACE_MAP_END NS_IMETHODIMP @@ -1094,7 +1094,7 @@ NS_INTERFACE_MAP_BEGIN(nsCSSDocumentRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSMozDocumentRule) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsCSSGroupRule) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSMozDocumentRule) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSMozDocumentRule) NS_INTERFACE_MAP_END #ifdef DEBUG @@ -1332,7 +1332,7 @@ NS_INTERFACE_MAP_BEGIN(CSSNameSpaceRuleImpl) NS_INTERFACE_MAP_ENTRY(nsIStyleRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsICSSNameSpaceRule) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSNameSpaceRule) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSNameSpaceRule) NS_INTERFACE_MAP_END IMPL_STYLE_RULE_INHERIT(CSSNameSpaceRuleImpl, nsCSSRule) @@ -1594,7 +1594,7 @@ nsCSSFontFaceStyleDecl::Fields[] = { NS_INTERFACE_MAP_BEGIN(nsCSSFontFaceStyleDecl) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSStyleDeclaration) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSFontFaceStyleDecl) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSFontFaceStyleDecl) NS_INTERFACE_MAP_END NS_IMPL_ADDREF_USING_AGGREGATOR(nsCSSFontFaceStyleDecl, ContainingRule()) @@ -1820,7 +1820,7 @@ NS_INTERFACE_MAP_BEGIN(nsCSSFontFaceRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSFontFaceRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsICSSRule) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSFontFaceRule) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSFontFaceRule) NS_INTERFACE_MAP_END IMPL_STYLE_RULE_INHERIT(nsCSSFontFaceRule, nsCSSRule) diff --git a/layout/style/nsCSSStyleRule.cpp b/layout/style/nsCSSStyleRule.cpp index a160ae73347a..3d034fccde0b 100644 --- a/layout/style/nsCSSStyleRule.cpp +++ b/layout/style/nsCSSStyleRule.cpp @@ -1120,7 +1120,7 @@ NS_INTERFACE_MAP_BEGIN(DOMCSSStyleRuleImpl) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSStyleRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSStyleRule) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSStyleRule) NS_INTERFACE_MAP_END NS_IMPL_ADDREF(DOMCSSStyleRuleImpl) diff --git a/layout/style/nsCSSStyleSheet.cpp b/layout/style/nsCSSStyleSheet.cpp index 4bd978732492..db0f95e92f15 100644 --- a/layout/style/nsCSSStyleSheet.cpp +++ b/layout/style/nsCSSStyleSheet.cpp @@ -123,7 +123,7 @@ NS_INTERFACE_MAP_BEGIN(CSSRuleListImpl) NS_INTERFACE_MAP_ENTRY(nsICSSRuleList) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRuleList) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSRuleList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSRuleList) NS_INTERFACE_MAP_END @@ -509,7 +509,7 @@ nsMediaQuery::Matches(nsPresContext* aPresContext, NS_INTERFACE_MAP_BEGIN(nsMediaList) NS_INTERFACE_MAP_ENTRY(nsIDOMMediaList) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(MediaList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MediaList) NS_INTERFACE_MAP_END NS_IMPL_ADDREF(nsMediaList) @@ -1066,7 +1066,7 @@ NS_INTERFACE_MAP_BEGIN(nsCSSStyleSheet) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSStyleSheet) NS_INTERFACE_MAP_ENTRY(nsICSSLoaderObserver) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsICSSStyleSheet) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSStyleSheet) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSStyleSheet) NS_INTERFACE_MAP_END diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp index f260da029e1c..144b00f54336 100644 --- a/layout/style/nsComputedDOMStyle.cpp +++ b/layout/style/nsComputedDOMStyle.cpp @@ -172,7 +172,7 @@ NS_INTERFACE_TABLE_HEAD(nsComputedDOMStyle) new CSS2PropertiesTearoff(this)) NS_INTERFACE_MAP_ENTRY_AGGREGATED(nsIDOMNSCSS2Properties, new CSS2PropertiesTearoff(this)) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(ComputedCSSStyleDeclaration) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ComputedCSSStyleDeclaration) NS_INTERFACE_MAP_END diff --git a/layout/style/nsDOMCSSDeclaration.cpp b/layout/style/nsDOMCSSDeclaration.cpp index 67306dc1d60d..30b4a8ca8e46 100644 --- a/layout/style/nsDOMCSSDeclaration.cpp +++ b/layout/style/nsDOMCSSDeclaration.cpp @@ -72,7 +72,7 @@ NS_INTERFACE_TABLE_HEAD(nsDOMCSSDeclaration) new CSS2PropertiesTearoff(this)) NS_INTERFACE_MAP_ENTRY_AGGREGATED(nsIDOMNSCSS2Properties, new CSS2PropertiesTearoff(this)) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSStyleDeclaration) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSStyleDeclaration) NS_INTERFACE_MAP_END NS_IMETHODIMP diff --git a/layout/style/nsDOMCSSRGBColor.cpp b/layout/style/nsDOMCSSRGBColor.cpp index 322bece4e341..d0f6628176e7 100644 --- a/layout/style/nsDOMCSSRGBColor.cpp +++ b/layout/style/nsDOMCSSRGBColor.cpp @@ -62,7 +62,7 @@ NS_INTERFACE_MAP_BEGIN(nsDOMCSSRGBColor) NS_INTERFACE_MAP_ENTRY(nsIDOMRGBColor) NS_INTERFACE_MAP_ENTRY(nsIDOMNSRGBAColor) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSRGBColor) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSRGBColor) NS_INTERFACE_MAP_END NS_IMPL_ADDREF(nsDOMCSSRGBColor) diff --git a/layout/style/nsDOMCSSRect.cpp b/layout/style/nsDOMCSSRect.cpp index c1f36c2b0c3e..bde920024872 100644 --- a/layout/style/nsDOMCSSRect.cpp +++ b/layout/style/nsDOMCSSRect.cpp @@ -59,7 +59,7 @@ nsDOMCSSRect::~nsDOMCSSRect(void) NS_INTERFACE_MAP_BEGIN(nsDOMCSSRect) NS_INTERFACE_MAP_ENTRY(nsIDOMRect) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSRect) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSRect) NS_INTERFACE_MAP_END NS_IMPL_ADDREF(nsDOMCSSRect) diff --git a/layout/style/nsDOMCSSValueList.cpp b/layout/style/nsDOMCSSValueList.cpp index 24982fc6584a..440f809c70e8 100644 --- a/layout/style/nsDOMCSSValueList.cpp +++ b/layout/style/nsDOMCSSValueList.cpp @@ -60,7 +60,7 @@ NS_INTERFACE_MAP_BEGIN(nsDOMCSSValueList) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSValueList) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSValue) NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSValueList) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSValueList) NS_INTERFACE_MAP_END PRBool diff --git a/layout/style/nsROCSSPrimitiveValue.cpp b/layout/style/nsROCSSPrimitiveValue.cpp index 1b32ac0a02df..632df73521d2 100644 --- a/layout/style/nsROCSSPrimitiveValue.cpp +++ b/layout/style/nsROCSSPrimitiveValue.cpp @@ -69,7 +69,7 @@ NS_INTERFACE_MAP_BEGIN(nsROCSSPrimitiveValue) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSPrimitiveValue) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSValue) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMCSSPrimitiveValue) - NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(ROCSSPrimitiveValue) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ROCSSPrimitiveValue) NS_INTERFACE_MAP_END