wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
--HG--
extra : rebase_source : a90cbb2d5b25c6e8dee96d206dd6e4951d2b3cab
This commit is contained in:
Peter Van der Beken 2013-05-21 15:07:38 +02:00
parent 9512f5d3d4
commit d8f14564ed
59 changed files with 156 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
content/html/content/src/HTMLAnchorElement.cpp
View File

@ -46,10 +46,10 @@ NS_IMPL_RELEASE_INHERITED(HTMLAnchorElement, Element)
// QueryInterface implementation for HTMLAnchorElement
NS_INTERFACE_TABLE_HEAD(HTMLAnchorElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE3(HTMLAnchorElement,
nsIDOMHTMLAnchorElement,
nsILink,
Link)
NS_INTERFACE_TABLE_INHERITED3(HTMLAnchorElement,
nsIDOMHTMLAnchorElement,
nsILink,
Link)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLAnchorElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

8
content/html/content/src/HTMLAreaElement.cpp
View File

@ -30,10 +30,10 @@ NS_IMPL_RELEASE_INHERITED(HTMLAreaElement, Element)
// QueryInterface implementation for HTMLAreaElement
NS_INTERFACE_TABLE_HEAD(HTMLAreaElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE3(HTMLAreaElement,
nsIDOMHTMLAreaElement,
nsILink,
Link)
NS_INTERFACE_TABLE_INHERITED3(HTMLAreaElement,
nsIDOMHTMLAreaElement,
nsILink,
Link)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLAreaElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

6
content/html/content/src/HTMLAudioElement.cpp
View File

@ -35,9 +35,9 @@ NS_IMPL_RELEASE_INHERITED(HTMLAudioElement, HTMLMediaElement)
NS_INTERFACE_TABLE_HEAD(HTMLAudioElement)
NS_HTML_CONTENT_INTERFACES(HTMLMediaElement)
NS_HTML_CONTENT_INTERFACE_TABLE4(HTMLAudioElement, nsIDOMHTMLMediaElement,
nsIDOMHTMLAudioElement, nsITimerCallback,
nsIAudioChannelAgentCallback)
NS_INTERFACE_TABLE_INHERITED4(HTMLAudioElement, nsIDOMHTMLMediaElement,
nsIDOMHTMLAudioElement, nsITimerCallback,
nsIAudioChannelAgentCallback)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLAudioElement,
HTMLMediaElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLBRElement.cpp
View File

@ -35,7 +35,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLBRElement, Element)
// QueryInterface implementation for HTMLBRElement
NS_INTERFACE_TABLE_HEAD(HTMLBRElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLBRElement, nsIDOMHTMLBRElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLBRElement, nsIDOMHTMLBRElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLBRElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLBodyElement.cpp
View File

@ -205,7 +205,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLBodyElement, Element)
// QueryInterface implementation for HTMLBodyElement
NS_INTERFACE_TABLE_HEAD(HTMLBodyElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLBodyElement, nsIDOMHTMLBodyElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLBodyElement, nsIDOMHTMLBodyElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLBodyElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

6
content/html/content/src/HTMLButtonElement.cpp
View File

@ -85,9 +85,9 @@ NS_IMPL_RELEASE_INHERITED(HTMLButtonElement, Element)
// QueryInterface implementation for HTMLButtonElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLButtonElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_TABLE2(HTMLButtonElement,
nsIDOMHTMLButtonElement,
nsIConstraintValidation)
NS_INTERFACE_TABLE_INHERITED2(HTMLButtonElement,
nsIDOMHTMLButtonElement,
nsIConstraintValidation)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLButtonElement,
nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

6
content/html/content/src/HTMLCanvasElement.cpp
View File

@ -161,9 +161,9 @@ NS_IMPL_RELEASE_INHERITED(HTMLCanvasElement, Element)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLCanvasElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE2(HTMLCanvasElement,
nsIDOMHTMLCanvasElement,
nsICanvasElementExternal)
NS_INTERFACE_TABLE_INHERITED2(HTMLCanvasElement,
nsIDOMHTMLCanvasElement,
nsICanvasElementExternal)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLCanvasElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLDataElement.cpp
View File

@ -27,7 +27,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLDataElement, Element)
NS_INTERFACE_TABLE_HEAD(HTMLDataElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE0(HTMLDataElement)
NS_INTERFACE_TABLE_INHERITED0(HTMLDataElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLDataElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLDataListElement.cpp
View File

@ -29,8 +29,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLDataListElement, Element)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLDataListElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLDataListElement,
nsIDOMHTMLDataListElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLDataListElement,
nsIDOMHTMLDataListElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLDataListElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLDivElement.cpp
View File

@ -26,7 +26,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLDivElement, Element)
// QueryInterface implementation for HTMLDivElement
NS_INTERFACE_TABLE_HEAD(HTMLDivElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLDivElement, nsIDOMHTMLDivElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLDivElement, nsIDOMHTMLDivElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLDivElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLElement.cpp
View File

@ -57,7 +57,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLElement, Element)
NS_INTERFACE_TABLE_HEAD(HTMLElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE0(HTMLElement)
NS_INTERFACE_TABLE_INHERITED0(HTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

6
content/html/content/src/HTMLFieldSetElement.cpp
View File

@ -46,9 +46,9 @@ NS_IMPL_RELEASE_INHERITED(HTMLFieldSetElement, Element)
// QueryInterface implementation for HTMLFieldSetElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLFieldSetElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_TABLE2(HTMLFieldSetElement,
nsIDOMHTMLFieldSetElement,
nsIConstraintValidation)
NS_INTERFACE_TABLE_INHERITED2(HTMLFieldSetElement,
nsIDOMHTMLFieldSetElement,
nsIConstraintValidation)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLFieldSetElement,
nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLFontElement.cpp
View File

@ -33,7 +33,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLFontElement, Element)
// QueryInterface implementation for HTMLFontElement
NS_INTERFACE_TABLE_HEAD(HTMLFontElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLFontElement, nsIDOMHTMLFontElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLFontElement, nsIDOMHTMLFontElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLFontElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLFrameElement.cpp
View File

@ -33,7 +33,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLFrameElement, Element)
// QueryInterface implementation for HTMLFrameElement
NS_INTERFACE_TABLE_HEAD(HTMLFrameElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLFrameElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLFrameElement, nsIDOMHTMLFrameElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLFrameElement, nsIDOMHTMLFrameElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLFrameElement,
nsGenericHTMLFrameElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLFrameSetElement.cpp
View File

@ -29,8 +29,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLFrameSetElement, Element)
// QueryInterface implementation for HTMLFrameSetElement
NS_INTERFACE_TABLE_HEAD(HTMLFrameSetElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLFrameSetElement,
nsIDOMHTMLFrameSetElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLFrameSetElement,
nsIDOMHTMLFrameSetElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLFrameSetElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLHRElement.cpp
View File

@ -27,8 +27,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLHRElement, Element)
// QueryInterface implementation for HTMLHRElement
NS_INTERFACE_TABLE_HEAD(HTMLHRElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLHRElement,
nsIDOMHTMLHRElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLHRElement,
nsIDOMHTMLHRElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLHRElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLHeadingElement.cpp
View File

@ -28,8 +28,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLHeadingElement, Element)
// QueryInterface implementation for HTMLHeadingElement
NS_INTERFACE_TABLE_HEAD(HTMLHeadingElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLHeadingElement,
nsIDOMHTMLHeadingElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLHeadingElement,
nsIDOMHTMLHeadingElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLHeadingElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

6
content/html/content/src/HTMLIFrameElement.cpp
View File

@ -37,9 +37,9 @@ NS_IMPL_RELEASE_INHERITED(HTMLIFrameElement, Element)
// QueryInterface implementation for HTMLIFrameElement
NS_INTERFACE_TABLE_HEAD(HTMLIFrameElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLFrameElement)
NS_HTML_CONTENT_INTERFACE_TABLE2(HTMLIFrameElement,
nsIDOMHTMLIFrameElement,
nsIDOMGetSVGDocument)
NS_INTERFACE_TABLE_INHERITED2(HTMLIFrameElement,
nsIDOMHTMLIFrameElement,
nsIDOMGetSVGDocument)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLIFrameElement,
nsGenericHTMLFrameElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

10
content/html/content/src/HTMLImageElement.cpp
View File

@ -86,11 +86,11 @@ NS_IMPL_RELEASE_INHERITED(HTMLImageElement, Element)
// QueryInterface implementation for HTMLImageElement
NS_INTERFACE_TABLE_HEAD(HTMLImageElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE4(HTMLImageElement,
nsIDOMHTMLImageElement,
nsIImageLoadingContent,
imgIOnloadBlocker,
imgINotificationObserver)
NS_INTERFACE_TABLE_INHERITED4(HTMLImageElement,
nsIDOMHTMLImageElement,
nsIImageLoadingContent,
imgIOnloadBlocker,
imgINotificationObserver)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLImageElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

18
content/html/content/src/HTMLInputElement.cpp
View File

@ -731,15 +731,15 @@ NS_IMPL_RELEASE_INHERITED(HTMLInputElement, Element)
// QueryInterface implementation for HTMLInputElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLInputElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_TABLE8(HTMLInputElement,
nsIDOMHTMLInputElement,
nsITextControlElement,
nsIPhonetic,
imgINotificationObserver,
nsIImageLoadingContent,
imgIOnloadBlocker,
nsIDOMNSEditableElement,
nsIConstraintValidation)
NS_INTERFACE_TABLE_INHERITED8(HTMLInputElement,
nsIDOMHTMLInputElement,
nsITextControlElement,
nsIPhonetic,
imgINotificationObserver,
nsIImageLoadingContent,
imgIOnloadBlocker,
nsIDOMNSEditableElement,
nsIConstraintValidation)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLInputElement,
nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLLIElement.cpp
View File

@ -28,7 +28,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLLIElement, Element)
// QueryInterface implementation for nsHTMLLIElement
NS_INTERFACE_TABLE_HEAD(HTMLLIElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLLIElement, nsIDOMHTMLLIElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLLIElement, nsIDOMHTMLLIElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLLIElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLLabelElement.cpp
View File

@ -37,8 +37,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLLabelElement, Element)
// QueryInterface implementation for HTMLLabelElement
NS_INTERFACE_TABLE_HEAD(HTMLLabelElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLLabelElement,
nsIDOMHTMLLabelElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLLabelElement,
nsIDOMHTMLLabelElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLLabelElement,
nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLLegendElement.cpp
View File

@ -27,7 +27,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLLegendElement, Element)
// QueryInterface implementation for HTMLLegendElement
NS_INTERFACE_TABLE_HEAD(HTMLLegendElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLLegendElement, nsIDOMHTMLLegendElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLLegendElement, nsIDOMHTMLLegendElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLLegendElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

12
content/html/content/src/HTMLLinkElement.cpp
View File

@ -56,12 +56,12 @@ NS_IMPL_RELEASE_INHERITED(HTMLLinkElement, Element)
// QueryInterface implementation for HTMLLinkElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLLinkElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE5(HTMLLinkElement,
nsIDOMHTMLLinkElement,
nsIDOMLinkStyle,
nsILink,
nsIStyleSheetLinkingElement,
Link)
NS_INTERFACE_TABLE_INHERITED5(HTMLLinkElement,
nsIDOMHTMLLinkElement,
nsIDOMLinkStyle,
nsILink,
nsIStyleSheetLinkingElement,
Link)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLLinkElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLMapElement.cpp
View File

@ -33,7 +33,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLMapElement, Element)
// QueryInterface implementation for HTMLMapElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLMapElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLMapElement, nsIDOMHTMLMapElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLMapElement, nsIDOMHTMLMapElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLMapElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

6
content/html/content/src/HTMLMenuElement.cpp
View File

@ -59,9 +59,9 @@ NS_IMPL_RELEASE_INHERITED(HTMLMenuElement, Element)
// QueryInterface implementation for HTMLMenuElement
NS_INTERFACE_TABLE_HEAD(HTMLMenuElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE2(HTMLMenuElement,
nsIDOMHTMLMenuElement,
nsIHTMLMenu)
NS_INTERFACE_TABLE_INHERITED2(HTMLMenuElement,
nsIDOMHTMLMenuElement,
nsIHTMLMenu)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLMenuElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

6
content/html/content/src/HTMLMenuItemElement.cpp
View File

@ -177,9 +177,9 @@ NS_IMPL_RELEASE_INHERITED(HTMLMenuItemElement, Element)
// QueryInterface implementation for HTMLMenuItemElement
NS_INTERFACE_TABLE_HEAD(HTMLMenuItemElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE2(HTMLMenuItemElement,
nsIDOMHTMLCommandElement,
nsIDOMHTMLMenuItemElement)
NS_INTERFACE_TABLE_INHERITED2(HTMLMenuItemElement,
nsIDOMHTMLCommandElement,
nsIDOMHTMLMenuItemElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLMenuItemElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLMetaElement.cpp
View File

@ -32,7 +32,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLMetaElement, Element)
// QueryInterface implementation for HTMLMetaElement
NS_INTERFACE_TABLE_HEAD(HTMLMetaElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLMetaElement, nsIDOMHTMLMetaElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLMetaElement, nsIDOMHTMLMetaElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLMetaElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLMeterElement.cpp
View File

@ -32,8 +32,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLMeterElement, Element)
NS_INTERFACE_TABLE_HEAD(HTMLMeterElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLMeterElement,
nsIDOMHTMLMeterElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLMeterElement,
nsIDOMHTMLMeterElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLMeterElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLModElement.cpp
View File

@ -29,8 +29,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLModElement, Element)
// QueryInterface implementation for HTMLModElement
NS_INTERFACE_TABLE_HEAD(HTMLModElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLModElement,
nsIDOMHTMLModElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLModElement,
nsIDOMHTMLModElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLModElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

27
content/html/content/src/HTMLObjectElement.cpp
View File

@ -81,20 +81,19 @@ NS_IMPL_RELEASE_INHERITED(HTMLObjectElement, Element)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLObjectElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(HTMLObjectElement)
NS_INTERFACE_TABLE_ENTRY(HTMLObjectElement, nsIDOMHTMLObjectElement)
NS_INTERFACE_TABLE_ENTRY(HTMLObjectElement, imgINotificationObserver)
NS_INTERFACE_TABLE_ENTRY(HTMLObjectElement, nsIRequestObserver)
NS_INTERFACE_TABLE_ENTRY(HTMLObjectElement, nsIStreamListener)
NS_INTERFACE_TABLE_ENTRY(HTMLObjectElement, nsIFrameLoaderOwner)
NS_INTERFACE_TABLE_ENTRY(HTMLObjectElement, nsIObjectLoadingContent)
NS_INTERFACE_TABLE_ENTRY(HTMLObjectElement, nsIImageLoadingContent)
NS_INTERFACE_TABLE_ENTRY(HTMLObjectElement, imgIOnloadBlocker)
NS_INTERFACE_TABLE_ENTRY(HTMLObjectElement, nsIInterfaceRequestor)
NS_INTERFACE_TABLE_ENTRY(HTMLObjectElement, nsIChannelEventSink)
NS_INTERFACE_TABLE_ENTRY(HTMLObjectElement, nsIConstraintValidation)
NS_INTERFACE_TABLE_ENTRY(HTMLObjectElement, nsIDOMGetSVGDocument)
NS_OFFSET_AND_INTERFACE_TABLE_END
NS_INTERFACE_TABLE_INHERITED12(HTMLObjectElement,
nsIDOMHTMLObjectElement,
imgINotificationObserver,
nsIRequestObserver,
nsIStreamListener,
nsIFrameLoaderOwner,
nsIObjectLoadingContent,
nsIImageLoadingContent,
imgIOnloadBlocker,
nsIInterfaceRequestor,
nsIChannelEventSink,
nsIConstraintValidation,
nsIDOMGetSVGDocument)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLObjectElement,
nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLOptGroupElement.cpp
View File

@ -47,8 +47,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLOptGroupElement, Element)
// QueryInterface implementation for HTMLOptGroupElement
NS_INTERFACE_TABLE_HEAD(HTMLOptGroupElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLOptGroupElement,
nsIDOMHTMLOptGroupElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLOptGroupElement,
nsIDOMHTMLOptGroupElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLOptGroupElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLOptionElement.cpp
View File

@ -83,8 +83,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLOptionElement, Element)
// QueryInterface implementation for HTMLOptionElement
NS_INTERFACE_TABLE_HEAD(HTMLOptionElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLOptionElement,
nsIDOMHTMLOptionElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLOptionElement,
nsIDOMHTMLOptionElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLOptionElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

8
content/html/content/src/HTMLOutputElement.cpp
View File

@ -55,10 +55,10 @@ NS_IMPL_RELEASE_INHERITED(HTMLOutputElement, Element)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLOutputElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_TABLE3(HTMLOutputElement,
nsIDOMHTMLOutputElement,
nsIMutationObserver,
nsIConstraintValidation)
NS_INTERFACE_TABLE_INHERITED3(HTMLOutputElement,
nsIDOMHTMLOutputElement,
nsIMutationObserver,
nsIConstraintValidation)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLOutputElement,
nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLParagraphElement.cpp
View File

@ -26,8 +26,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLParagraphElement, Element)
// QueryInterface implementation for nsHTMLParagraphElement
NS_INTERFACE_TABLE_HEAD(HTMLParagraphElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLParagraphElement,
nsIDOMHTMLParagraphElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLParagraphElement,
nsIDOMHTMLParagraphElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLParagraphElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLPreElement.cpp
View File

@ -27,7 +27,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLPreElement, Element)
// QueryInterface implementation for HTMLPreElement
NS_INTERFACE_TABLE_HEAD(HTMLPreElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLPreElement, nsIDOMHTMLPreElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLPreElement, nsIDOMHTMLPreElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLPreElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLProgressElement.cpp
View File

@ -35,8 +35,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLProgressElement, Element)
NS_INTERFACE_TABLE_HEAD(HTMLProgressElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLProgressElement,
nsIDOMHTMLProgressElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLProgressElement,
nsIDOMHTMLProgressElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLProgressElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

10
content/html/content/src/HTMLScriptElement.cpp
View File

@ -54,11 +54,11 @@ NS_IMPL_RELEASE_INHERITED(HTMLScriptElement, Element)
// QueryInterface implementation for HTMLScriptElement
NS_INTERFACE_TABLE_HEAD(HTMLScriptElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE4(HTMLScriptElement,
nsIDOMHTMLScriptElement,
nsIScriptLoaderObserver,
nsIScriptElement,
nsIMutationObserver)
NS_INTERFACE_TABLE_INHERITED4(HTMLScriptElement,
nsIDOMHTMLScriptElement,
nsIScriptLoaderObserver,
nsIScriptElement,
nsIMutationObserver)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLScriptElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

7
content/html/content/src/HTMLSelectElement.cpp
View File

@ -148,13 +148,12 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_IMPL_ADDREF_INHERITED(HTMLSelectElement, Element)
NS_IMPL_RELEASE_INHERITED(HTMLSelectElement, Element)
// QueryInterface implementation for HTMLSelectElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLSelectElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_TABLE2(HTMLSelectElement,
nsIDOMHTMLSelectElement,
nsIConstraintValidation)
NS_INTERFACE_TABLE_INHERITED2(HTMLSelectElement,
nsIDOMHTMLSelectElement,
nsIConstraintValidation)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLSelectElement,
nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

3
content/html/content/src/HTMLSharedElement.cpp
View File

@ -35,9 +35,6 @@ NS_IMPL_RELEASE_INHERITED(HTMLSharedElement, Element)
NS_INTERFACE_TABLE_HEAD(HTMLSharedElement)
NS_HTML_CONTENT_INTERFACES_AMBIGUOUS(nsGenericHTMLElement,
nsIDOMHTMLParamElement)
NS_HTML_CONTENT_INTERFACE_TABLE_AMBIGUOUS_BEGIN(HTMLSharedElement,
nsIDOMHTMLParamElement)
NS_OFFSET_AND_INTERFACE_TABLE_END
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE_AMBIGUOUS(HTMLSharedElement,
nsGenericHTMLElement,
nsIDOMHTMLParamElement)

3
content/html/content/src/HTMLSharedListElement.cpp
View File

@ -31,9 +31,6 @@ NS_IMPL_RELEASE_INHERITED(HTMLSharedListElement, Element)
NS_INTERFACE_TABLE_HEAD(HTMLSharedListElement)
NS_HTML_CONTENT_INTERFACES_AMBIGUOUS(nsGenericHTMLElement,
nsIDOMHTMLOListElement)
NS_HTML_CONTENT_INTERFACE_TABLE_AMBIGUOUS_BEGIN(HTMLSharedListElement,
nsIDOMHTMLOListElement)
NS_OFFSET_AND_INTERFACE_TABLE_END
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE_AMBIGUOUS(HTMLSharedListElement,
nsGenericHTMLElement,
nsIDOMHTMLOListElement)

22
content/html/content/src/HTMLSharedObjectElement.cpp
View File

@ -94,18 +94,16 @@ NS_IMPL_RELEASE_INHERITED(HTMLSharedObjectElement, Element)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLSharedObjectElement)
NS_HTML_CONTENT_INTERFACES_AMBIGUOUS(nsGenericHTMLElement,
nsIDOMHTMLAppletElement)
NS_HTML_CONTENT_INTERFACE_TABLE_AMBIGUOUS_BEGIN(HTMLSharedObjectElement,
nsIDOMHTMLAppletElement)
NS_INTERFACE_TABLE_ENTRY(HTMLSharedObjectElement, nsIRequestObserver)
NS_INTERFACE_TABLE_ENTRY(HTMLSharedObjectElement, nsIStreamListener)
NS_INTERFACE_TABLE_ENTRY(HTMLSharedObjectElement, nsIFrameLoaderOwner)
NS_INTERFACE_TABLE_ENTRY(HTMLSharedObjectElement, nsIObjectLoadingContent)
NS_INTERFACE_TABLE_ENTRY(HTMLSharedObjectElement, imgINotificationObserver)
NS_INTERFACE_TABLE_ENTRY(HTMLSharedObjectElement, nsIImageLoadingContent)
NS_INTERFACE_TABLE_ENTRY(HTMLSharedObjectElement, imgIOnloadBlocker)
NS_INTERFACE_TABLE_ENTRY(HTMLSharedObjectElement, nsIInterfaceRequestor)
NS_INTERFACE_TABLE_ENTRY(HTMLSharedObjectElement, nsIChannelEventSink)
NS_OFFSET_AND_INTERFACE_TABLE_END
NS_INTERFACE_TABLE_INHERITED9(HTMLSharedObjectElement,
nsIRequestObserver,
nsIStreamListener,
nsIFrameLoaderOwner,
nsIObjectLoadingContent,
imgINotificationObserver,
nsIImageLoadingContent,
imgIOnloadBlocker,
nsIInterfaceRequestor,
nsIChannelEventSink)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE_AMBIGUOUS(HTMLSharedObjectElement,
nsGenericHTMLElement,
nsIDOMHTMLAppletElement)

2
content/html/content/src/HTMLSourceElement.cpp
View File

@ -31,7 +31,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLSourceElement, Element)
// QueryInterface implementation for HTMLSourceElement
NS_INTERFACE_TABLE_HEAD(HTMLSourceElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLSourceElement, nsIDOMHTMLSourceElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLSourceElement, nsIDOMHTMLSourceElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLSourceElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLSpanElement.cpp
View File

@ -26,7 +26,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLSpanElement, Element)
// QueryInterface implementation for HTMLSpanElement
NS_INTERFACE_TABLE_HEAD(HTMLSpanElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE0(HTMLSpanElement)
NS_INTERFACE_TABLE_INHERITED0(HTMLSpanElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLSpanElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

10
content/html/content/src/HTMLStyleElement.cpp
View File

@ -48,11 +48,11 @@ NS_IMPL_RELEASE_INHERITED(HTMLStyleElement, Element)
// QueryInterface implementation for HTMLStyleElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLStyleElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE4(HTMLStyleElement,
nsIDOMHTMLStyleElement,
nsIDOMLinkStyle,
nsIStyleSheetLinkingElement,
nsIMutationObserver)
NS_INTERFACE_TABLE_INHERITED4(HTMLStyleElement,
nsIDOMHTMLStyleElement,
nsIDOMLinkStyle,
nsIStyleSheetLinkingElement,
nsIMutationObserver)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLStyleElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLTableCaptionElement.cpp
View File

@ -32,8 +32,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLTableCaptionElement, Element)
// QueryInterface implementation for HTMLTableCaptionElement
NS_INTERFACE_TABLE_HEAD(HTMLTableCaptionElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLTableCaptionElement,
nsIDOMHTMLTableCaptionElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLTableCaptionElement,
nsIDOMHTMLTableCaptionElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableCaptionElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLTableCellElement.cpp
View File

@ -36,8 +36,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLTableCellElement, Element)
// QueryInterface implementation for HTMLTableCellElement
NS_INTERFACE_TABLE_HEAD(HTMLTableCellElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLTableCellElement,
nsIDOMHTMLTableCellElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLTableCellElement,
nsIDOMHTMLTableCellElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableCellElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLTableColElement.cpp
View File

@ -36,8 +36,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLTableColElement, Element)
// QueryInterface implementation for HTMLTableColElement
NS_INTERFACE_TABLE_HEAD(HTMLTableColElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLTableColElement,
nsIDOMHTMLTableColElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLTableColElement,
nsIDOMHTMLTableColElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableColElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLTableElement.cpp
View File

@ -333,7 +333,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLTableElement, Element)
// QueryInterface implementation for HTMLTableElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLTableElement, nsIDOMHTMLTableElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLTableElement, nsIDOMHTMLTableElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLTableRowElement.cpp
View File

@ -37,8 +37,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLTableRowElement, Element)
// QueryInterface implementation for HTMLTableRowElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableRowElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLTableRowElement,
nsIDOMHTMLTableRowElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLTableRowElement,
nsIDOMHTMLTableRowElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableRowElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLTableSectionElement.cpp
View File

@ -37,8 +37,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLTableSectionElement, Element)
// QueryInterface implementation for HTMLTableSectionElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableSectionElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLTableSectionElement,
nsIDOMHTMLTableSectionElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLTableSectionElement,
nsIDOMHTMLTableSectionElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableSectionElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLTemplateElement.cpp
View File

@ -73,7 +73,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED_1(HTMLTemplateElement,
// QueryInterface implementation for HTMLTemplateElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTemplateElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE0(HTMLTemplateElement)
NS_INTERFACE_TABLE_INHERITED0(HTMLTemplateElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTemplateElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

12
content/html/content/src/HTMLTextAreaElement.cpp
View File

@ -88,12 +88,12 @@ NS_IMPL_RELEASE_INHERITED(HTMLTextAreaElement, Element)
// QueryInterface implementation for HTMLTextAreaElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTextAreaElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_TABLE5(HTMLTextAreaElement,
nsIDOMHTMLTextAreaElement,
nsITextControlElement,
nsIDOMNSEditableElement,
nsIMutationObserver,
nsIConstraintValidation)
NS_INTERFACE_TABLE_INHERITED5(HTMLTextAreaElement,
nsIDOMHTMLTextAreaElement,
nsITextControlElement,
nsIDOMNSEditableElement,
nsIMutationObserver,
nsIConstraintValidation)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTextAreaElement,
nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLTimeElement.cpp
View File

@ -30,7 +30,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLTimeElement, Element)
NS_INTERFACE_TABLE_HEAD(HTMLTimeElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE0(HTMLTimeElement)
NS_INTERFACE_TABLE_INHERITED0(HTMLTimeElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTimeElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

6
content/html/content/src/HTMLTitleElement.cpp
View File

@ -41,9 +41,9 @@ namespace dom {
// QueryInterface implementation for HTMLTitleElement
NS_INTERFACE_TABLE_HEAD(HTMLTitleElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE2(HTMLTitleElement,
nsIDOMHTMLTitleElement,
nsIMutationObserver)
NS_INTERFACE_TABLE_INHERITED2(HTMLTitleElement,
nsIDOMHTMLTitleElement,
nsIMutationObserver)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTitleElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

4
content/html/content/src/HTMLUnknownElement.cpp
View File

@ -37,8 +37,8 @@ HTMLUnknownElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aScope)
// QueryInterface implementation for HTMLUnknownElement
NS_INTERFACE_TABLE_HEAD(HTMLUnknownElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLUnknownElement,
nsIDOMHTMLUnknownElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLUnknownElement,
nsIDOMHTMLUnknownElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLUnknownElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

2
content/html/content/src/HTMLVideoElement.cpp
View File

@ -44,7 +44,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLVideoElement, HTMLMediaElement)
NS_INTERFACE_TABLE_HEAD(HTMLVideoElement)
NS_HTML_CONTENT_INTERFACES(HTMLMediaElement)
NS_HTML_CONTENT_INTERFACE_TABLE2(HTMLVideoElement, nsIDOMHTMLMediaElement, nsIDOMHTMLVideoElement)
NS_INTERFACE_TABLE_INHERITED2(HTMLVideoElement, nsIDOMHTMLMediaElement, nsIDOMHTMLVideoElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLVideoElement,
HTMLMediaElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

115
content/html/content/src/nsGenericHTMLElement.h
View File

@ -1440,18 +1440,9 @@ protected:
* QueryInterface() implementation helper macros
*/
#define NS_HTML_CONTENT_INTERFACE_TABLE_AMBIGUOUS_BEGIN(_class, _base) \
NS_NODE_OFFSET_AND_INTERFACE_TABLE_BEGIN(_class) \
NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMNode, _base) \
NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMElement, _base) \
NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMHTMLElement, _base)
#define NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(_class) \
NS_HTML_CONTENT_INTERFACE_TABLE_AMBIGUOUS_BEGIN(_class, nsIDOMHTMLElement)
#define NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE_AMBIGUOUS(_class, _base, \
_base_if) \
NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE
NS_INTERFACE_TABLE_TO_MAP_SEGUE
#define NS_HTML_CONTENT_INTERFACES_AMBIGUOUS(_base, _base_if) \
{ \
@ -1494,110 +1485,6 @@ protected:
} \
} else
#define NS_HTML_CONTENT_INTERFACE_TABLE0(_class) \
NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(_class) \
NS_OFFSET_AND_INTERFACE_TABLE_END
#define NS_HTML_CONTENT_INTERFACE_TABLE1(_class, _i1) \
NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(_class) \
NS_INTERFACE_TABLE_ENTRY(_class, _i1) \
NS_OFFSET_AND_INTERFACE_TABLE_END
#define NS_HTML_CONTENT_INTERFACE_TABLE2(_class, _i1, _i2) \
NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(_class) \
NS_INTERFACE_TABLE_ENTRY(_class, _i1) \
NS_INTERFACE_TABLE_ENTRY(_class, _i2) \
NS_OFFSET_AND_INTERFACE_TABLE_END
#define NS_HTML_CONTENT_INTERFACE_TABLE3(_class, _i1, _i2, _i3) \
NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(_class) \
NS_INTERFACE_TABLE_ENTRY(_class, _i1) \
NS_INTERFACE_TABLE_ENTRY(_class, _i2) \
NS_INTERFACE_TABLE_ENTRY(_class, _i3) \
NS_OFFSET_AND_INTERFACE_TABLE_END
#define NS_HTML_CONTENT_INTERFACE_TABLE4(_class, _i1, _i2, _i3, _i4) \
NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(_class) \
NS_INTERFACE_TABLE_ENTRY(_class, _i1) \
NS_INTERFACE_TABLE_ENTRY(_class, _i2) \
NS_INTERFACE_TABLE_ENTRY(_class, _i3) \
NS_INTERFACE_TABLE_ENTRY(_class, _i4) \
NS_OFFSET_AND_INTERFACE_TABLE_END
#define NS_HTML_CONTENT_INTERFACE_TABLE5(_class, _i1, _i2, _i3, _i4, _i5) \
NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(_class) \
NS_INTERFACE_TABLE_ENTRY(_class, _i1) \
NS_INTERFACE_TABLE_ENTRY(_class, _i2) \
NS_INTERFACE_TABLE_ENTRY(_class, _i3) \
NS_INTERFACE_TABLE_ENTRY(_class, _i4) \
NS_INTERFACE_TABLE_ENTRY(_class, _i5) \
NS_OFFSET_AND_INTERFACE_TABLE_END
#define NS_HTML_CONTENT_INTERFACE_TABLE6(_class, _i1, _i2, _i3, _i4, _i5, \
_i6) \
NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(_class) \
NS_INTERFACE_TABLE_ENTRY(_class, _i1) \
NS_INTERFACE_TABLE_ENTRY(_class, _i2) \
NS_INTERFACE_TABLE_ENTRY(_class, _i3) \
NS_INTERFACE_TABLE_ENTRY(_class, _i4) \
NS_INTERFACE_TABLE_ENTRY(_class, _i5) \
NS_INTERFACE_TABLE_ENTRY(_class, _i6) \
NS_OFFSET_AND_INTERFACE_TABLE_END
#define NS_HTML_CONTENT_INTERFACE_TABLE7(_class, _i1, _i2, _i3, _i4, _i5, \
_i6, _i7) \
NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(_class) \
NS_INTERFACE_TABLE_ENTRY(_class, _i1) \
NS_INTERFACE_TABLE_ENTRY(_class, _i2) \
NS_INTERFACE_TABLE_ENTRY(_class, _i3) \
NS_INTERFACE_TABLE_ENTRY(_class, _i4) \
NS_INTERFACE_TABLE_ENTRY(_class, _i5) \
NS_INTERFACE_TABLE_ENTRY(_class, _i6) \
NS_INTERFACE_TABLE_ENTRY(_class, _i7) \
NS_OFFSET_AND_INTERFACE_TABLE_END
#define NS_HTML_CONTENT_INTERFACE_TABLE8(_class, _i1, _i2, _i3, _i4, _i5, \
_i6, _i7, _i8) \
NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(_class) \
NS_INTERFACE_TABLE_ENTRY(_class, _i1) \
NS_INTERFACE_TABLE_ENTRY(_class, _i2) \
NS_INTERFACE_TABLE_ENTRY(_class, _i3) \
NS_INTERFACE_TABLE_ENTRY(_class, _i4) \
NS_INTERFACE_TABLE_ENTRY(_class, _i5) \
NS_INTERFACE_TABLE_ENTRY(_class, _i6) \
NS_INTERFACE_TABLE_ENTRY(_class, _i7) \
NS_INTERFACE_TABLE_ENTRY(_class, _i8) \
NS_OFFSET_AND_INTERFACE_TABLE_END
#define NS_HTML_CONTENT_INTERFACE_TABLE9(_class, _i1, _i2, _i3, _i4, _i5, \
_i6, _i7, _i8, _i9) \
NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(_class) \
NS_INTERFACE_TABLE_ENTRY(_class, _i1) \
NS_INTERFACE_TABLE_ENTRY(_class, _i2) \
NS_INTERFACE_TABLE_ENTRY(_class, _i3) \
NS_INTERFACE_TABLE_ENTRY(_class, _i4) \
NS_INTERFACE_TABLE_ENTRY(_class, _i5) \
NS_INTERFACE_TABLE_ENTRY(_class, _i6) \
NS_INTERFACE_TABLE_ENTRY(_class, _i7) \
NS_INTERFACE_TABLE_ENTRY(_class, _i8) \
NS_INTERFACE_TABLE_ENTRY(_class, _i9) \
NS_OFFSET_AND_INTERFACE_TABLE_END
#define NS_HTML_CONTENT_INTERFACE_TABLE10(_class, _i1, _i2, _i3, _i4, _i5, \
_i6, _i7, _i8, _i9, _i10) \
NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(_class) \
NS_INTERFACE_TABLE_ENTRY(_class, _i1) \
NS_INTERFACE_TABLE_ENTRY(_class, _i2) \
NS_INTERFACE_TABLE_ENTRY(_class, _i3) \
NS_INTERFACE_TABLE_ENTRY(_class, _i4) \
NS_INTERFACE_TABLE_ENTRY(_class, _i5) \
NS_INTERFACE_TABLE_ENTRY(_class, _i6) \
NS_INTERFACE_TABLE_ENTRY(_class, _i7) \
NS_INTERFACE_TABLE_ENTRY(_class, _i8) \
NS_INTERFACE_TABLE_ENTRY(_class, _i9) \
NS_INTERFACE_TABLE_ENTRY(_class, _i10) \
NS_OFFSET_AND_INTERFACE_TABLE_END
#define NS_FORWARD_NSIDOMHTMLELEMENT_TO_GENERIC \
NS_IMETHOD GetId(nsAString& aId) MOZ_FINAL { \
mozilla::dom::Element::GetId(aId); \

10
content/html/content/src/nsHTMLFormElement.cpp
View File

@ -302,11 +302,11 @@ DOMCI_NODE_DATA(HTMLFormElement, nsHTMLFormElement)
// QueryInterface implementation for nsHTMLFormElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLFormElement)
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE4(nsHTMLFormElement,
nsIDOMHTMLFormElement,
nsIForm,
nsIWebProgressListener,
nsIRadioGroupContainer)
NS_INTERFACE_TABLE_INHERITED4(nsHTMLFormElement,
nsIDOMHTMLFormElement,
nsIForm,
nsIWebProgressListener,
nsIRadioGroupContainer)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLFormElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLFormElement)