Bug 877654 - Remove thisptr offset tables - Replace HTML element QI map end macro with generic macros. r=Ms2ger.

--HG-- extra : rebase_source : 1a425102a6d183814e4afbb16ee3416e138567ff
2013-05-21 15:38:33 +02:00 · 2013-05-21 15:38:33 +02:00 · 8c9328dfef
--- a/content/html/content/src/HTMLAnchorElement.cpp
+++ b/content/html/content/src/HTMLAnchorElement.cpp
@ -51,7 +51,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLAnchorElement)
                                nsILink,
                                Link)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLAnchorElement)
--- a/content/html/content/src/HTMLAreaElement.cpp
+++ b/content/html/content/src/HTMLAreaElement.cpp
@ -35,7 +35,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLAreaElement)
                                nsILink,
                                Link)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLAreaElement)
--- a/content/html/content/src/HTMLAudioElement.cpp
+++ b/content/html/content/src/HTMLAudioElement.cpp
@ -39,7 +39,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLAudioElement)
                                nsIDOMHTMLAudioElement, nsITimerCallback,
                                nsIAudioChannelAgentCallback)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLAudioElement)

--- a/content/html/content/src/HTMLBRElement.cpp
+++ b/content/html/content/src/HTMLBRElement.cpp
@ -37,7 +37,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLBRElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLBRElement, nsIDOMHTMLBRElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLBRElement)
--- a/content/html/content/src/HTMLBodyElement.cpp
+++ b/content/html/content/src/HTMLBodyElement.cpp
@ -207,7 +207,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLBodyElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLBodyElement, nsIDOMHTMLBodyElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLBodyElement)

--- a/content/html/content/src/HTMLButtonElement.cpp
+++ b/content/html/content/src/HTMLButtonElement.cpp
@ -89,7 +89,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLButtonElement)
                                nsIDOMHTMLButtonElement,
                                nsIConstraintValidation)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 // nsIConstraintValidation
 NS_IMPL_NSICONSTRAINTVALIDATION(HTMLButtonElement)
--- a/content/html/content/src/HTMLCanvasElement.cpp
+++ b/content/html/content/src/HTMLCanvasElement.cpp
@ -165,7 +165,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLCanvasElement)
                                nsIDOMHTMLCanvasElement,
                                nsICanvasElementExternal)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLCanvasElement)

--- a/content/html/content/src/HTMLDataElement.cpp
+++ b/content/html/content/src/HTMLDataElement.cpp
@ -27,7 +27,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLDataElement, Element)

 NS_INTERFACE_MAP_BEGIN(HTMLDataElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLDataElement)

--- a/content/html/content/src/HTMLDataListElement.cpp
+++ b/content/html/content/src/HTMLDataListElement.cpp
@ -32,7 +32,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLDataListElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLDataListElement,
                                nsIDOMHTMLDataListElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLDataListElement)
--- a/content/html/content/src/HTMLDivElement.cpp
+++ b/content/html/content/src/HTMLDivElement.cpp
@ -28,7 +28,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLDivElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLDivElement, nsIDOMHTMLDivElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLDivElement)

--- a/content/html/content/src/HTMLElement.cpp
+++ b/content/html/content/src/HTMLElement.cpp
@ -57,7 +57,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLElement, Element)

 NS_INTERFACE_MAP_BEGIN(HTMLElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLElement)

--- a/content/html/content/src/HTMLFieldSetElement.cpp
+++ b/content/html/content/src/HTMLFieldSetElement.cpp
@ -50,7 +50,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLFieldSetElement)
                                nsIDOMHTMLFieldSetElement,
                                nsIConstraintValidation)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLFieldSetElement)

--- a/content/html/content/src/HTMLFontElement.cpp
+++ b/content/html/content/src/HTMLFontElement.cpp
@ -35,7 +35,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLFontElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLFontElement, nsIDOMHTMLFontElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLFontElement)
--- a/content/html/content/src/HTMLFrameElement.cpp
+++ b/content/html/content/src/HTMLFrameElement.cpp
@ -35,7 +35,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLFrameElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLFrameElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLFrameElement, nsIDOMHTMLFrameElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLFrameElement)
--- a/content/html/content/src/HTMLFrameSetElement.cpp
+++ b/content/html/content/src/HTMLFrameSetElement.cpp
@ -32,7 +32,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLFrameSetElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLFrameSetElement,
                                nsIDOMHTMLFrameSetElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLFrameSetElement)
--- a/content/html/content/src/HTMLHRElement.cpp
+++ b/content/html/content/src/HTMLHRElement.cpp
@ -30,7 +30,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLHRElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLHRElement,
                                nsIDOMHTMLHRElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLHRElement)
--- a/content/html/content/src/HTMLHeadingElement.cpp
+++ b/content/html/content/src/HTMLHeadingElement.cpp
@ -31,7 +31,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLHeadingElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLHeadingElement,
                                nsIDOMHTMLHeadingElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLHeadingElement)
--- a/content/html/content/src/HTMLIFrameElement.cpp
+++ b/content/html/content/src/HTMLIFrameElement.cpp
@ -41,7 +41,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLIFrameElement)
                                nsIDOMHTMLIFrameElement,
                                nsIDOMGetSVGDocument)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLIFrameElement)

--- a/content/html/content/src/HTMLImageElement.cpp
+++ b/content/html/content/src/HTMLImageElement.cpp
@ -92,7 +92,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLImageElement)
                                imgIOnloadBlocker,
                                imgINotificationObserver)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLImageElement)
--- a/content/html/content/src/HTMLInputElement.cpp
+++ b/content/html/content/src/HTMLInputElement.cpp
@ -741,7 +741,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLInputElement)
                                nsIDOMNSEditableElement,
                                nsIConstraintValidation)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 // nsIConstraintValidation
 NS_IMPL_NSICONSTRAINTVALIDATION_EXCEPT_SETCUSTOMVALIDITY(HTMLInputElement)
--- a/content/html/content/src/HTMLLIElement.cpp
+++ b/content/html/content/src/HTMLLIElement.cpp
@ -30,7 +30,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLLIElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLLIElement, nsIDOMHTMLLIElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLLIElement)

--- a/content/html/content/src/HTMLLabelElement.cpp
+++ b/content/html/content/src/HTMLLabelElement.cpp
@ -40,7 +40,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLLabelElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLLabelElement,
                                nsIDOMHTMLLabelElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 // nsIDOMHTMLLabelElement
--- a/content/html/content/src/HTMLLegendElement.cpp
+++ b/content/html/content/src/HTMLLegendElement.cpp
@ -29,7 +29,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLLegendElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLLegendElement, nsIDOMHTMLLegendElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 // nsIDOMHTMLLegendElement
--- a/content/html/content/src/HTMLLinkElement.cpp
+++ b/content/html/content/src/HTMLLinkElement.cpp
@ -63,7 +63,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLLinkElement)
                                nsIStyleSheetLinkingElement,
                                Link)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLLinkElement)
--- a/content/html/content/src/HTMLMapElement.cpp
+++ b/content/html/content/src/HTMLMapElement.cpp
@ -35,7 +35,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLMapElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLMapElement, nsIDOMHTMLMapElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLMapElement)

--- a/content/html/content/src/HTMLMenuElement.cpp
+++ b/content/html/content/src/HTMLMenuElement.cpp
@ -63,7 +63,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLMenuElement)
                                nsIDOMHTMLMenuElement,
                                nsIHTMLMenu)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLMenuElement)

--- a/content/html/content/src/HTMLMenuItemElement.cpp
+++ b/content/html/content/src/HTMLMenuItemElement.cpp
@ -181,7 +181,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLMenuItemElement)
                                nsIDOMHTMLCommandElement,
                                nsIDOMHTMLMenuItemElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 //NS_IMPL_ELEMENT_CLONE(HTMLMenuItemElement)
 nsresult
--- a/content/html/content/src/HTMLMetaElement.cpp
+++ b/content/html/content/src/HTMLMetaElement.cpp
@ -34,7 +34,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLMetaElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLMetaElement, nsIDOMHTMLMetaElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLMetaElement)
--- a/content/html/content/src/HTMLMeterElement.cpp
+++ b/content/html/content/src/HTMLMeterElement.cpp
@ -35,7 +35,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLMeterElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLMeterElement,
                                nsIDOMHTMLMeterElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLMeterElement)

--- a/content/html/content/src/HTMLModElement.cpp
+++ b/content/html/content/src/HTMLModElement.cpp
@ -32,7 +32,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLModElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLModElement,
                                nsIDOMHTMLModElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLModElement)
--- a/content/html/content/src/HTMLObjectElement.cpp
+++ b/content/html/content/src/HTMLObjectElement.cpp
@ -95,7 +95,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLObjectElement)
                                 nsIConstraintValidation,
                                 nsIDOMGetSVGDocument)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLObjectElement)

--- a/content/html/content/src/HTMLOptGroupElement.cpp
+++ b/content/html/content/src/HTMLOptGroupElement.cpp
@ -50,7 +50,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLOptGroupElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLOptGroupElement,
                                nsIDOMHTMLOptGroupElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLOptGroupElement)
--- a/content/html/content/src/HTMLOptionElement.cpp
+++ b/content/html/content/src/HTMLOptionElement.cpp
@ -86,7 +86,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLOptionElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLOptionElement,
                                nsIDOMHTMLOptionElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLOptionElement)
--- a/content/html/content/src/HTMLOutputElement.cpp
+++ b/content/html/content/src/HTMLOutputElement.cpp
@ -60,7 +60,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLOutputElement)
                                nsIMutationObserver,
                                nsIConstraintValidation)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLOutputElement)

--- a/content/html/content/src/HTMLParagraphElement.cpp
+++ b/content/html/content/src/HTMLParagraphElement.cpp
@ -29,7 +29,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLParagraphElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLParagraphElement,
                                nsIDOMHTMLParagraphElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLParagraphElement)

--- a/content/html/content/src/HTMLPreElement.cpp
+++ b/content/html/content/src/HTMLPreElement.cpp
@ -29,7 +29,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLPreElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLPreElement, nsIDOMHTMLPreElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLPreElement)

--- a/content/html/content/src/HTMLProgressElement.cpp
+++ b/content/html/content/src/HTMLProgressElement.cpp
@ -38,7 +38,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLProgressElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLProgressElement,
                                nsIDOMHTMLProgressElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLProgressElement)

--- a/content/html/content/src/HTMLScriptElement.cpp
+++ b/content/html/content/src/HTMLScriptElement.cpp
@ -60,7 +60,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLScriptElement)
                                nsIScriptElement,
                                nsIMutationObserver)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 nsresult
--- a/content/html/content/src/HTMLSelectElement.cpp
+++ b/content/html/content/src/HTMLSelectElement.cpp
@ -155,7 +155,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLSelectElement)
                                nsIDOMHTMLSelectElement,
                                nsIConstraintValidation)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 // nsIDOMHTMLSelectElement
--- a/content/html/content/src/HTMLSharedElement.cpp
+++ b/content/html/content/src/HTMLSharedElement.cpp
@ -42,7 +42,7 @@ NS_INTERFACE_MAP_BEGIN(HTMLSharedElement)
  NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLQuoteElement, blockquote)
  NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLHeadElement, head)
  NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLHtmlElement, html)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLSharedElement)
--- a/content/html/content/src/HTMLSharedListElement.cpp
+++ b/content/html/content/src/HTMLSharedListElement.cpp
@ -34,7 +34,7 @@ NS_INTERFACE_MAP_BEGIN(HTMLSharedListElement)
  NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLOListElement, ol)
  NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLDListElement, dl)
  NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLUListElement, ul)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLSharedListElement)
--- a/content/html/content/src/HTMLSharedObjectElement.cpp
+++ b/content/html/content/src/HTMLSharedObjectElement.cpp
@ -108,7 +108,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLSharedObjectElement)
  NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLAppletElement, applet)
  NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLEmbedElement, embed)
  NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMGetSVGDocument, embed)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLSharedObjectElement)

--- a/content/html/content/src/HTMLSourceElement.cpp
+++ b/content/html/content/src/HTMLSourceElement.cpp
@ -33,7 +33,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLSourceElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLSourceElement, nsIDOMHTMLSourceElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLSourceElement)
--- a/content/html/content/src/HTMLSpanElement.cpp
+++ b/content/html/content/src/HTMLSpanElement.cpp
@ -26,7 +26,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLSpanElement, Element)
 // QueryInterface implementation for HTMLSpanElement
 NS_INTERFACE_MAP_BEGIN(HTMLSpanElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLSpanElement)
--- a/content/html/content/src/HTMLStyleElement.cpp
+++ b/content/html/content/src/HTMLStyleElement.cpp
@ -54,7 +54,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLStyleElement)
                                nsIStyleSheetLinkingElement,
                                nsIMutationObserver)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLStyleElement)

--- a/content/html/content/src/HTMLTableCaptionElement.cpp
+++ b/content/html/content/src/HTMLTableCaptionElement.cpp
@ -35,7 +35,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLTableCaptionElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLTableCaptionElement,
                                nsIDOMHTMLTableCaptionElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLTableCaptionElement)

--- a/content/html/content/src/HTMLTableCellElement.cpp
+++ b/content/html/content/src/HTMLTableCellElement.cpp
@ -39,7 +39,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLTableCellElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLTableCellElement,
                                nsIDOMHTMLTableCellElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLTableCellElement)
--- a/content/html/content/src/HTMLTableColElement.cpp
+++ b/content/html/content/src/HTMLTableColElement.cpp
@ -39,7 +39,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLTableColElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLTableColElement,
                                nsIDOMHTMLTableColElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLTableColElement)

--- a/content/html/content/src/HTMLTableElement.cpp
+++ b/content/html/content/src/HTMLTableElement.cpp
@ -335,7 +335,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLTableElement, nsIDOMHTMLTableElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLTableElement)
--- a/content/html/content/src/HTMLTableRowElement.cpp
+++ b/content/html/content/src/HTMLTableRowElement.cpp
@ -40,7 +40,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableRowElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLTableRowElement,
                                nsIDOMHTMLTableRowElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLTableRowElement)
--- a/content/html/content/src/HTMLTableSectionElement.cpp
+++ b/content/html/content/src/HTMLTableSectionElement.cpp
@ -40,7 +40,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableSectionElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLTableSectionElement,
                                nsIDOMHTMLTableSectionElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLTableSectionElement)
--- a/content/html/content/src/HTMLTemplateElement.cpp
+++ b/content/html/content/src/HTMLTemplateElement.cpp
@ -73,7 +73,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED_1(HTMLTemplateElement,
 // QueryInterface implementation for HTMLTemplateElement
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLTemplateElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE_WITH_INIT(HTMLTemplateElement)

--- a/content/html/content/src/HTMLTextAreaElement.cpp
+++ b/content/html/content/src/HTMLTextAreaElement.cpp
@ -95,7 +95,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTextAreaElement)
                                nsIMutationObserver,
                                nsIConstraintValidation)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 // nsIDOMHTMLTextAreaElement
--- a/content/html/content/src/HTMLTimeElement.cpp
+++ b/content/html/content/src/HTMLTimeElement.cpp
@ -30,7 +30,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLTimeElement, Element)

 NS_INTERFACE_MAP_BEGIN(HTMLTimeElement)
  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLTimeElement)

--- a/content/html/content/src/HTMLTitleElement.cpp
+++ b/content/html/content/src/HTMLTitleElement.cpp
@ -45,7 +45,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLTitleElement)
                                nsIDOMHTMLTitleElement,
                                nsIMutationObserver)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END


 NS_IMPL_ELEMENT_CLONE(HTMLTitleElement)
--- a/content/html/content/src/HTMLUnknownElement.cpp
+++ b/content/html/content/src/HTMLUnknownElement.cpp
@ -40,7 +40,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLUnknownElement)
  NS_INTERFACE_TABLE_INHERITED1(HTMLUnknownElement,
                                nsIDOMHTMLUnknownElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLUnknownElement)

--- a/content/html/content/src/HTMLVideoElement.cpp
+++ b/content/html/content/src/HTMLVideoElement.cpp
@ -46,7 +46,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLVideoElement)
  NS_HTML_CONTENT_INTERFACES(HTMLMediaElement)
  NS_INTERFACE_TABLE_INHERITED2(HTMLVideoElement, nsIDOMHTMLMediaElement, nsIDOMHTMLVideoElement)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END

 NS_IMPL_ELEMENT_CLONE(HTMLVideoElement)

--- a/content/html/content/src/nsGenericHTMLElement.h
+++ b/content/html/content/src/nsGenericHTMLElement.h
@ -1455,13 +1455,6 @@ protected:
 #define NS_HTML_CONTENT_INTERFACES(_base)                                     \
  NS_HTML_CONTENT_INTERFACES_AMBIGUOUS(_base, nsIDOMHTMLElement)

-#define NS_HTML_CONTENT_INTERFACE_MAP_END                                     \
-  NS_ELEMENT_INTERFACE_MAP_END
-
-#define NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(_class)                \
-    NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(_class)                              \
-  NS_HTML_CONTENT_INTERFACE_MAP_END
-
 #define NS_INTERFACE_MAP_ENTRY_IF_TAG(_interface, _tag)                       \
  NS_INTERFACE_MAP_ENTRY_CONDITIONAL(_interface,                              \
                                     mNodeInfo->Equals(nsGkAtoms::_tag))
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@ -308,7 +308,8 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLFormElement)
                                nsIWebProgressListener,
                                nsIRadioGroupContainer)
  NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLFormElement)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(HTMLFormElement)
+NS_ELEMENT_INTERFACE_MAP_END


 // nsIDOMHTMLFormElement