mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 877654 - Remove thisptr offset tables - Replace HTML element table to map segue macros with generic macros. r=Ms2ger.
--HG-- extra : rebase_source : 9acc316cbf68bc841f6751603aa512138e2f6de6
This commit is contained in:
parent
3bb139c487
commit
be32c1c08b
@ -50,8 +50,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLAnchorElement)
|
||||
nsIDOMHTMLAnchorElement,
|
||||
nsILink,
|
||||
Link)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLAnchorElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -34,8 +34,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLAreaElement)
|
||||
nsIDOMHTMLAreaElement,
|
||||
nsILink,
|
||||
Link)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLAreaElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -38,8 +38,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLAudioElement)
|
||||
NS_INTERFACE_TABLE_INHERITED4(HTMLAudioElement, nsIDOMHTMLMediaElement,
|
||||
nsIDOMHTMLAudioElement, nsITimerCallback,
|
||||
nsIAudioChannelAgentCallback)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLAudioElement,
|
||||
HTMLMediaElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLAudioElement)
|
||||
|
@ -36,8 +36,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLBRElement, Element)
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLBRElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLBRElement, nsIDOMHTMLBRElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLBRElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -206,8 +206,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLBodyElement, Element)
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLBodyElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLBodyElement, nsIDOMHTMLBodyElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLBodyElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLBodyElement)
|
||||
|
@ -88,8 +88,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLButtonElement)
|
||||
NS_INTERFACE_TABLE_INHERITED2(HTMLButtonElement,
|
||||
nsIDOMHTMLButtonElement,
|
||||
nsIConstraintValidation)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLButtonElement,
|
||||
nsGenericHTMLFormElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
// nsIConstraintValidation
|
||||
|
@ -164,8 +164,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLCanvasElement)
|
||||
NS_INTERFACE_TABLE_INHERITED2(HTMLCanvasElement,
|
||||
nsIDOMHTMLCanvasElement,
|
||||
nsICanvasElementExternal)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLCanvasElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLCanvasElement)
|
||||
|
@ -25,11 +25,8 @@ HTMLDataElement::~HTMLDataElement()
|
||||
NS_IMPL_ADDREF_INHERITED(HTMLDataElement, Element)
|
||||
NS_IMPL_RELEASE_INHERITED(HTMLDataElement, Element)
|
||||
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLDataElement)
|
||||
NS_INTERFACE_MAP_BEGIN(HTMLDataElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED0(HTMLDataElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLDataElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLDataElement)
|
||||
|
@ -31,8 +31,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLDataListElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLDataListElement,
|
||||
nsIDOMHTMLDataListElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLDataListElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -27,8 +27,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLDivElement, Element)
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLDivElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLDivElement, nsIDOMHTMLDivElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLDivElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLDivElement)
|
||||
|
@ -55,11 +55,8 @@ HTMLElement::~HTMLElement()
|
||||
NS_IMPL_ADDREF_INHERITED(HTMLElement, Element)
|
||||
NS_IMPL_RELEASE_INHERITED(HTMLElement, Element)
|
||||
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLElement)
|
||||
NS_INTERFACE_MAP_BEGIN(HTMLElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED0(HTMLElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLElement)
|
||||
|
@ -49,8 +49,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLFieldSetElement)
|
||||
NS_INTERFACE_TABLE_INHERITED2(HTMLFieldSetElement,
|
||||
nsIDOMHTMLFieldSetElement,
|
||||
nsIConstraintValidation)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLFieldSetElement,
|
||||
nsGenericHTMLFormElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLFieldSetElement)
|
||||
|
@ -34,8 +34,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLFontElement, Element)
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLFontElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLFontElement, nsIDOMHTMLFontElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLFontElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -34,8 +34,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLFrameElement, Element)
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLFrameElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLFrameElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLFrameElement, nsIDOMHTMLFrameElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLFrameElement,
|
||||
nsGenericHTMLFrameElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -31,8 +31,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLFrameSetElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLFrameSetElement,
|
||||
nsIDOMHTMLFrameSetElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLFrameSetElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -29,8 +29,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLHRElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLHRElement,
|
||||
nsIDOMHTMLHRElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLHRElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -30,8 +30,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLHeadingElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLHeadingElement,
|
||||
nsIDOMHTMLHeadingElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLHeadingElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -40,8 +40,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLIFrameElement)
|
||||
NS_INTERFACE_TABLE_INHERITED2(HTMLIFrameElement,
|
||||
nsIDOMHTMLIFrameElement,
|
||||
nsIDOMGetSVGDocument)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLIFrameElement,
|
||||
nsGenericHTMLFrameElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLIFrameElement)
|
||||
|
@ -91,8 +91,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLImageElement)
|
||||
nsIImageLoadingContent,
|
||||
imgIOnloadBlocker,
|
||||
imgINotificationObserver)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLImageElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -740,8 +740,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLInputElement)
|
||||
imgIOnloadBlocker,
|
||||
nsIDOMNSEditableElement,
|
||||
nsIConstraintValidation)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLInputElement,
|
||||
nsGenericHTMLFormElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
// nsIConstraintValidation
|
||||
|
@ -29,8 +29,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLLIElement, Element)
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLLIElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLLIElement, nsIDOMHTMLLIElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLLIElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLLIElement)
|
||||
|
@ -39,8 +39,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLLabelElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLFormElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLLabelElement,
|
||||
nsIDOMHTMLLabelElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLLabelElement,
|
||||
nsGenericHTMLFormElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -28,8 +28,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLLegendElement, Element)
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLLegendElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLLegendElement, nsIDOMHTMLLegendElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLLegendElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -62,8 +62,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLLinkElement)
|
||||
nsILink,
|
||||
nsIStyleSheetLinkingElement,
|
||||
Link)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLLinkElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -34,8 +34,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLMapElement, Element)
|
||||
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLMapElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLMapElement, nsIDOMHTMLMapElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLMapElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLMapElement)
|
||||
|
@ -62,8 +62,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLMenuElement)
|
||||
NS_INTERFACE_TABLE_INHERITED2(HTMLMenuElement,
|
||||
nsIDOMHTMLMenuElement,
|
||||
nsIHTMLMenu)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLMenuElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLMenuElement)
|
||||
|
@ -180,8 +180,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLMenuItemElement)
|
||||
NS_INTERFACE_TABLE_INHERITED2(HTMLMenuItemElement,
|
||||
nsIDOMHTMLCommandElement,
|
||||
nsIDOMHTMLMenuItemElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLMenuItemElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
//NS_IMPL_ELEMENT_CLONE(HTMLMenuItemElement)
|
||||
|
@ -33,8 +33,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLMetaElement, Element)
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLMetaElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLMetaElement, nsIDOMHTMLMetaElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLMetaElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -34,8 +34,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLMeterElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLMeterElement,
|
||||
nsIDOMHTMLMeterElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLMeterElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLMeterElement)
|
||||
|
@ -31,8 +31,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLModElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLModElement,
|
||||
nsIDOMHTMLModElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLModElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -94,8 +94,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLObjectElement)
|
||||
nsIChannelEventSink,
|
||||
nsIConstraintValidation,
|
||||
nsIDOMGetSVGDocument)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLObjectElement,
|
||||
nsGenericHTMLFormElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLObjectElement)
|
||||
|
@ -49,8 +49,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLOptGroupElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLOptGroupElement,
|
||||
nsIDOMHTMLOptGroupElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLOptGroupElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -85,8 +85,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLOptionElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLOptionElement,
|
||||
nsIDOMHTMLOptionElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLOptionElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -59,8 +59,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLOutputElement)
|
||||
nsIDOMHTMLOutputElement,
|
||||
nsIMutationObserver,
|
||||
nsIConstraintValidation)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLOutputElement,
|
||||
nsGenericHTMLFormElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLOutputElement)
|
||||
|
@ -28,8 +28,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLParagraphElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLParagraphElement,
|
||||
nsIDOMHTMLParagraphElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLParagraphElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLParagraphElement)
|
||||
|
@ -28,8 +28,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLPreElement, Element)
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLPreElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLPreElement, nsIDOMHTMLPreElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLPreElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLPreElement)
|
||||
|
@ -37,8 +37,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLProgressElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLProgressElement,
|
||||
nsIDOMHTMLProgressElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLProgressElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLProgressElement)
|
||||
|
@ -59,8 +59,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLScriptElement)
|
||||
nsIScriptLoaderObserver,
|
||||
nsIScriptElement,
|
||||
nsIMutationObserver)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLScriptElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -154,8 +154,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLSelectElement)
|
||||
NS_INTERFACE_TABLE_INHERITED2(HTMLSelectElement,
|
||||
nsIDOMHTMLSelectElement,
|
||||
nsIConstraintValidation)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLSelectElement,
|
||||
nsGenericHTMLFormElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -32,12 +32,9 @@ NS_IMPL_ADDREF_INHERITED(HTMLSharedElement, Element)
|
||||
NS_IMPL_RELEASE_INHERITED(HTMLSharedElement, Element)
|
||||
|
||||
// QueryInterface implementation for HTMLSharedElement
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLSharedElement)
|
||||
NS_INTERFACE_MAP_BEGIN(HTMLSharedElement)
|
||||
NS_HTML_CONTENT_INTERFACES_AMBIGUOUS(nsGenericHTMLElement,
|
||||
nsIDOMHTMLParamElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE_AMBIGUOUS(HTMLSharedElement,
|
||||
nsGenericHTMLElement,
|
||||
nsIDOMHTMLParamElement)
|
||||
NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLParamElement, param)
|
||||
NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLBaseElement, base)
|
||||
NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLDirectoryElement, dir)
|
||||
|
@ -28,12 +28,9 @@ NS_IMPL_ADDREF_INHERITED(HTMLSharedListElement, Element)
|
||||
NS_IMPL_RELEASE_INHERITED(HTMLSharedListElement, Element)
|
||||
|
||||
// QueryInterface implementation for nsHTMLSharedListElement
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLSharedListElement)
|
||||
NS_INTERFACE_MAP_BEGIN(HTMLSharedListElement)
|
||||
NS_HTML_CONTENT_INTERFACES_AMBIGUOUS(nsGenericHTMLElement,
|
||||
nsIDOMHTMLOListElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE_AMBIGUOUS(HTMLSharedListElement,
|
||||
nsGenericHTMLElement,
|
||||
nsIDOMHTMLOListElement)
|
||||
NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLOListElement, ol)
|
||||
NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLDListElement, dl)
|
||||
NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLUListElement, ul)
|
||||
|
@ -104,9 +104,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLSharedObjectElement)
|
||||
imgIOnloadBlocker,
|
||||
nsIInterfaceRequestor,
|
||||
nsIChannelEventSink)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE_AMBIGUOUS(HTMLSharedObjectElement,
|
||||
nsGenericHTMLElement,
|
||||
nsIDOMHTMLAppletElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLAppletElement, applet)
|
||||
NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLEmbedElement, embed)
|
||||
NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMGetSVGDocument, embed)
|
||||
|
@ -32,8 +32,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLSourceElement, Element)
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLSourceElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLSourceElement, nsIDOMHTMLSourceElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLSourceElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -24,11 +24,8 @@ NS_IMPL_ADDREF_INHERITED(HTMLSpanElement, Element)
|
||||
NS_IMPL_RELEASE_INHERITED(HTMLSpanElement, Element)
|
||||
|
||||
// QueryInterface implementation for HTMLSpanElement
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLSpanElement)
|
||||
NS_INTERFACE_MAP_BEGIN(HTMLSpanElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED0(HTMLSpanElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLSpanElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -53,8 +53,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLStyleElement)
|
||||
nsIDOMLinkStyle,
|
||||
nsIStyleSheetLinkingElement,
|
||||
nsIMutationObserver)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLStyleElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLStyleElement)
|
||||
|
@ -34,8 +34,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLTableCaptionElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLTableCaptionElement,
|
||||
nsIDOMHTMLTableCaptionElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableCaptionElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLTableCaptionElement)
|
||||
|
@ -38,8 +38,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLTableCellElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLTableCellElement,
|
||||
nsIDOMHTMLTableCellElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableCellElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -38,8 +38,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLTableColElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLTableColElement,
|
||||
nsIDOMHTMLTableColElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableColElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLTableColElement)
|
||||
|
@ -334,8 +334,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLTableElement, Element)
|
||||
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLTableElement, nsIDOMHTMLTableElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -39,8 +39,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableRowElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLTableRowElement,
|
||||
nsIDOMHTMLTableRowElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableRowElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -39,8 +39,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableSectionElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLTableSectionElement,
|
||||
nsIDOMHTMLTableSectionElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableSectionElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -71,11 +71,8 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED_1(HTMLTemplateElement,
|
||||
mContent)
|
||||
|
||||
// QueryInterface implementation for HTMLTemplateElement
|
||||
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTemplateElement)
|
||||
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLTemplateElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED0(HTMLTemplateElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTemplateElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE_WITH_INIT(HTMLTemplateElement)
|
||||
|
@ -94,8 +94,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTextAreaElement)
|
||||
nsIDOMNSEditableElement,
|
||||
nsIMutationObserver,
|
||||
nsIConstraintValidation)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTextAreaElement,
|
||||
nsGenericHTMLFormElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -28,11 +28,8 @@ HTMLTimeElement::~HTMLTimeElement()
|
||||
NS_IMPL_ADDREF_INHERITED(HTMLTimeElement, Element)
|
||||
NS_IMPL_RELEASE_INHERITED(HTMLTimeElement, Element)
|
||||
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLTimeElement)
|
||||
NS_INTERFACE_MAP_BEGIN(HTMLTimeElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED0(HTMLTimeElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTimeElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLTimeElement)
|
||||
|
@ -44,8 +44,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLTitleElement)
|
||||
NS_INTERFACE_TABLE_INHERITED2(HTMLTitleElement,
|
||||
nsIDOMHTMLTitleElement,
|
||||
nsIMutationObserver)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTitleElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
|
||||
|
@ -39,8 +39,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLUnknownElement)
|
||||
NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED1(HTMLUnknownElement,
|
||||
nsIDOMHTMLUnknownElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLUnknownElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLUnknownElement)
|
||||
|
@ -45,8 +45,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLVideoElement, HTMLMediaElement)
|
||||
NS_INTERFACE_TABLE_HEAD(HTMLVideoElement)
|
||||
NS_HTML_CONTENT_INTERFACES(HTMLMediaElement)
|
||||
NS_INTERFACE_TABLE_INHERITED2(HTMLVideoElement, nsIDOMHTMLMediaElement, nsIDOMHTMLVideoElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLVideoElement,
|
||||
HTMLMediaElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_MAP_END
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(HTMLVideoElement)
|
||||
|
@ -1440,10 +1440,6 @@ protected:
|
||||
* QueryInterface() implementation helper macros
|
||||
*/
|
||||
|
||||
#define NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE_AMBIGUOUS(_class, _base, \
|
||||
_base_if) \
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
|
||||
#define NS_HTML_CONTENT_INTERFACES_AMBIGUOUS(_base, _base_if) \
|
||||
{ \
|
||||
nsresult html_rv = _base::QueryInterface(aIID, aInstancePtr); \
|
||||
@ -1459,10 +1455,6 @@ protected:
|
||||
#define NS_HTML_CONTENT_INTERFACES(_base) \
|
||||
NS_HTML_CONTENT_INTERFACES_AMBIGUOUS(_base, nsIDOMHTMLElement)
|
||||
|
||||
#define NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(_class, _base) \
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE_AMBIGUOUS(_class, _base, \
|
||||
nsIDOMHTMLElement)
|
||||
|
||||
#define NS_HTML_CONTENT_INTERFACE_MAP_END \
|
||||
NS_ELEMENT_INTERFACE_MAP_END
|
||||
|
||||
|
@ -307,8 +307,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLFormElement)
|
||||
nsIForm,
|
||||
nsIWebProgressListener,
|
||||
nsIRadioGroupContainer)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLFormElement,
|
||||
nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLFormElement)
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user