Fix for bug 844225 (Remove some DOMCI and quickstubs). r=bz.

This commit is contained in:
Peter Van der Beken 2013-01-10 10:54:46 +01:00
parent af92dee354
commit 60efffbed9
131 changed files with 95 additions and 1359 deletions

View File

@ -15,9 +15,6 @@
using namespace mozilla;
using namespace dom;
// DOMCI_NODE_DATA needs to be outside our namespaces
DOMCI_NODE_DATA(Comment, Comment)
nsresult
NS_NewCommentNode(nsIContent** aInstancePtrResult,
nsNodeInfoManager *aNodeInfoManager)
@ -46,17 +43,8 @@ Comment::~Comment()
{
}
// QueryInterface implementation for Comment
NS_INTERFACE_TABLE_HEAD(Comment)
NS_NODE_INTERFACE_TABLE3(Comment, nsIDOMNode, nsIDOMCharacterData,
nsIDOMComment)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Comment)
NS_INTERFACE_MAP_END_INHERITING(nsGenericDOMDataNode)
NS_IMPL_ADDREF_INHERITED(Comment, nsGenericDOMDataNode)
NS_IMPL_RELEASE_INHERITED(Comment, nsGenericDOMDataNode)
NS_IMPL_ISUPPORTS_INHERITED3(Comment, nsGenericDOMDataNode, nsIDOMNode,
nsIDOMCharacterData, nsIDOMComment)
bool
Comment::IsNodeOfType(uint32_t aFlags) const

View File

@ -43,8 +43,6 @@ public:
virtual nsGenericDOMDataNode* CloneDataNode(nsINodeInfo *aNodeInfo,
bool aCloneText) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
#ifdef DEBUG
virtual void List(FILE* out, int32_t aIndent) const;

View File

@ -38,8 +38,6 @@ NS_NewDocumentFragment(nsIDOMDocumentFragment** aInstancePtrResult,
return NS_OK;
}
DOMCI_NODE_DATA(DocumentFragment, mozilla::dom::DocumentFragment)
namespace mozilla {
namespace dom {
@ -160,7 +158,6 @@ NS_INTERFACE_MAP_BEGIN(DocumentFragment)
// below line, make sure nsNodeSH::PreCreate() still does the right
// thing!
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIContent)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DocumentFragment)
NS_INTERFACE_MAP_END
NS_IMPL_ADDREF_INHERITED(DocumentFragment, FragmentOrElement)

View File

@ -78,8 +78,6 @@ public:
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsIAtom* DoGetID() const;

View File

@ -19,8 +19,6 @@
#include "nsWrapperCacheInlines.h"
#include "mozilla/dom/DocumentTypeBinding.h"
DOMCI_NODE_DATA(DocumentType, mozilla::dom::DocumentType)
nsresult
NS_NewDOMDocumentType(nsIDOMDocumentType** aDocType,
nsNodeInfoManager *aNodeInfoManager,
@ -91,16 +89,8 @@ DocumentType::~DocumentType()
{
}
// QueryInterface implementation for DocumentType
NS_INTERFACE_TABLE_HEAD(DocumentType)
NS_NODE_INTERFACE_TABLE2(DocumentType, nsIDOMNode, nsIDOMDocumentType)
NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(DocumentType)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DocumentType)
NS_INTERFACE_MAP_END_INHERITING(nsGenericDOMDataNode)
NS_IMPL_ADDREF_INHERITED(DocumentType, nsGenericDOMDataNode)
NS_IMPL_RELEASE_INHERITED(DocumentType, nsGenericDOMDataNode)
NS_IMPL_ISUPPORTS_INHERITED2(DocumentType, nsGenericDOMDataNode, nsIDOMNode,
nsIDOMDocumentType)
bool
DocumentType::IsNodeOfType(uint32_t aFlags) const

View File

@ -73,8 +73,6 @@ public:
virtual nsGenericDOMDataNode* CloneDataNode(nsINodeInfo *aNodeInfo,
bool aCloneText) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:

View File

@ -376,13 +376,8 @@ NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END
NS_INTERFACE_TABLE_HEAD(nsChildContentList)
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_NODELIST_OFFSET_AND_INTERFACE_TABLE_BEGIN(nsChildContentList)
NS_INTERFACE_TABLE_ENTRY(nsChildContentList, nsINodeList)
NS_INTERFACE_TABLE_ENTRY(nsChildContentList, nsIDOMNodeList)
NS_OFFSET_AND_INTERFACE_TABLE_END
NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE
NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsChildContentList)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(NodeList)
NS_INTERFACE_TABLE2(nsChildContentList, nsINodeList, nsIDOMNodeList)
NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsChildContentList)
NS_INTERFACE_MAP_END
JSObject*

View File

@ -85,17 +85,11 @@ NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END
NS_INTERFACE_TABLE_ENTRY(_class, nsINodeList) \
NS_INTERFACE_TABLE_ENTRY(_class, nsIDOMNodeList)
DOMCI_DATA(NodeList, nsBaseContentList)
// QueryInterface implementation for nsBaseContentList
NS_INTERFACE_TABLE_HEAD(nsBaseContentList)
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_NODELIST_OFFSET_AND_INTERFACE_TABLE_BEGIN(nsBaseContentList)
NS_CONTENT_LIST_INTERFACES(nsBaseContentList)
NS_OFFSET_AND_INTERFACE_TABLE_END
NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE
NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsBaseContentList)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(NodeList)
NS_INTERFACE_TABLE2(nsBaseContentList, nsINodeList, nsIDOMNodeList)
NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsBaseContentList)
NS_INTERFACE_MAP_END
@ -527,23 +521,9 @@ nsContentList::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap)
return HTMLCollectionBinding::Wrap(cx, scope, this, triedToWrap);
}
DOMCI_DATA(ContentList, nsContentList)
// QueryInterface implementation for nsContentList
NS_INTERFACE_TABLE_HEAD(nsContentList)
NS_NODELIST_OFFSET_AND_INTERFACE_TABLE_BEGIN(nsContentList)
NS_CONTENT_LIST_INTERFACES(nsContentList)
NS_INTERFACE_TABLE_ENTRY(nsContentList, nsIHTMLCollection)
NS_INTERFACE_TABLE_ENTRY(nsContentList, nsIDOMHTMLCollection)
NS_INTERFACE_TABLE_ENTRY(nsContentList, nsIMutationObserver)
NS_OFFSET_AND_INTERFACE_TABLE_END
NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ContentList)
NS_INTERFACE_MAP_END_INHERITING(nsBaseContentList)
NS_IMPL_ADDREF_INHERITED(nsContentList, nsBaseContentList)
NS_IMPL_RELEASE_INHERITED(nsContentList, nsBaseContentList)
NS_IMPL_ISUPPORTS_INHERITED3(nsContentList, nsBaseContentList,
nsIHTMLCollection, nsIDOMHTMLCollection,
nsIMutationObserver)
uint32_t
nsContentList::Length(bool aDoFlush)

View File

@ -729,15 +729,12 @@ nsDOMMemoryFile::DataOwner::EnsureMemoryReporterRegistered()
////////////////////////////////////////////////////////////////////////////
// nsDOMFileList implementation
DOMCI_DATA(FileList, nsDOMFileList)
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(nsDOMFileList)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMFileList)
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFileList)
NS_INTERFACE_MAP_ENTRY(nsIDOMFileList)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(FileList)
NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMFileList)

View File

@ -117,18 +117,8 @@ nsTextNode::~nsTextNode()
{
}
NS_IMPL_ADDREF_INHERITED(nsTextNode, nsGenericDOMDataNode)
NS_IMPL_RELEASE_INHERITED(nsTextNode, nsGenericDOMDataNode)
DOMCI_NODE_DATA(Text, nsTextNode)
// QueryInterface implementation for nsTextNode
NS_INTERFACE_TABLE_HEAD(nsTextNode)
NS_NODE_INTERFACE_TABLE3(nsTextNode, nsIDOMNode, nsIDOMText,
nsIDOMCharacterData)
NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsTextNode)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Text)
NS_INTERFACE_MAP_END_INHERITING(nsGenericDOMDataNode)
NS_IMPL_ISUPPORTS_INHERITED3(nsTextNode, nsGenericDOMDataNode, nsIDOMNode,
nsIDOMText, nsIDOMCharacterData)
JSObject*
nsTextNode::WrapNode(JSContext *aCx, JSObject *aScope, bool *aTriedToWrap)

View File

@ -49,8 +49,6 @@ public:
virtual nsGenericDOMDataNode* CloneDataNode(nsINodeInfo *aNodeInfo,
bool aCloneText) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers);

View File

@ -5,7 +5,6 @@
#include "nsPaintRequest.h"
#include "nsDOMClassInfoID.h"
#include "nsIFrame.h"
#include "nsContentUtils.h"
#include "mozilla/dom/PaintRequestBinding.h"
@ -14,15 +13,12 @@
using namespace mozilla;
using namespace mozilla::dom;
DOMCI_DATA(PaintRequest, nsPaintRequest)
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsPaintRequest, mParent)
NS_INTERFACE_TABLE_HEAD(nsPaintRequest)
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_INTERFACE_TABLE1(nsPaintRequest, nsIDOMPaintRequest)
NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsPaintRequest)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(PaintRequest)
NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsPaintRequest)
@ -57,15 +53,12 @@ nsPaintRequest::GetXPCOMReason(nsAString& aResult)
return NS_OK;
}
DOMCI_DATA(PaintRequestList, nsPaintRequestList)
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsPaintRequestList, mParent)
NS_INTERFACE_TABLE_HEAD(nsPaintRequestList)
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_INTERFACE_TABLE1(nsPaintRequestList, nsIDOMPaintRequestList)
NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsPaintRequestList)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(PaintRequestList)
NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsPaintRequestList)

View File

@ -16,7 +16,6 @@
#include "nsHTMLDNSPrefetch.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Anchor)
DOMCI_NODE_DATA(HTMLAnchorElement, mozilla::dom::HTMLAnchorElement)
namespace mozilla {
namespace dom {
@ -52,7 +51,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLAnchorElement)
Link)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLAnchorElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLAnchorElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLAnchorElement)

View File

@ -90,8 +90,6 @@ public:
virtual nsEventStates IntrinsicState() const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual void OnDNSPrefetchDeferred();

View File

@ -8,7 +8,6 @@
#include "mozilla/dom/HTMLAreaElementBinding.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Area)
DOMCI_NODE_DATA(HTMLAreaElement, mozilla::dom::HTMLAreaElement)
namespace mozilla {
namespace dom {
@ -35,7 +34,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLAreaElement)
Link)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLAreaElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLAreaElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLAreaElement)

View File

@ -78,8 +78,6 @@ public:
virtual nsEventStates IntrinsicState() const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL

View File

@ -15,8 +15,6 @@
NS_IMPL_NS_NEW_HTML_ELEMENT(BR)
DOMCI_NODE_DATA(HTMLBRElement, mozilla::dom::HTMLBRElement)
namespace mozilla {
namespace dom {
@ -39,7 +37,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLBRElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLBRElement, nsIDOMHTMLBRElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLBRElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLBRElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLBRElement)

View File

@ -42,7 +42,6 @@ public:
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
bool Clear()

View File

@ -23,7 +23,6 @@
#include "nsGlobalWindow.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Body)
DOMCI_NODE_DATA(HTMLBodyElement, mozilla::dom::HTMLBodyElement)
namespace mozilla {
namespace dom {
@ -208,7 +207,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLBodyElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLBodyElement, nsIDOMHTMLBodyElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLBodyElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLBodyElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLBodyElement)

View File

@ -141,7 +141,6 @@ public:
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual already_AddRefed<nsIEditor> GetAssociatedEditor();
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual bool IsEventAttributeName(nsIAtom* aName) MOZ_OVERRIDE;

View File

@ -37,7 +37,6 @@
#define NS_OUTER_ACTIVATE_EVENT (1 << 1)
NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(Button)
DOMCI_NODE_DATA(HTMLButtonElement, mozilla::dom::HTMLButtonElement)
namespace mozilla {
namespace dom {
@ -97,7 +96,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLButtonElement)
nsIConstraintValidation)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLButtonElement,
nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLButtonElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
// nsIConstraintValidation
NS_IMPL_NSICONSTRAINTVALIDATION(HTMLButtonElement)

View File

@ -58,7 +58,6 @@ public:
// nsINode
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual JSObject*
WrapNode(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap) MOZ_OVERRIDE;

View File

@ -7,7 +7,6 @@
#include "mozilla/dom/HTMLDataListElementBinding.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(DataList)
DOMCI_NODE_DATA(HTMLDataListElement, mozilla::dom::HTMLDataListElement)
namespace mozilla {
namespace dom {
@ -41,7 +40,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLDataListElement)
nsIDOMHTMLDataListElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLDataListElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLDataListElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLDataListElement)

View File

@ -57,7 +57,6 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(HTMLDataListElement,
nsGenericHTMLElement)
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,

View File

@ -12,7 +12,6 @@
#include "mozilla/dom/HTMLDivElementBinding.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Div)
DOMCI_NODE_DATA(HTMLDivElement, mozilla::dom::HTMLDivElement)
namespace mozilla {
namespace dom {
@ -29,7 +28,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLDivElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLDivElement, nsIDOMHTMLDivElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLDivElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLDivElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLDivElement)

View File

@ -66,7 +66,6 @@ public:
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:

View File

@ -35,8 +35,6 @@ public:
virtual nsresult Clone(nsINodeInfo* aNodeInfo,
nsINode** aResult) const MOZ_OVERRIDE;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
@ -61,7 +59,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE0(HTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLElement)
@ -101,5 +99,3 @@ NS_NewHTMLElement(already_AddRefed<nsINodeInfo> aNodeInfo,
{
return new mozilla::dom::HTMLElement(aNodeInfo);
}
DOMCI_NODE_DATA(HTMLElement, mozilla::dom::HTMLElement)

View File

@ -8,8 +8,6 @@
#include "nsEventDispatcher.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(FieldSet)
DOMCI_NODE_DATA(HTMLFieldSetElement, mozilla::dom::HTMLFieldSetElement)
namespace mozilla {
namespace dom {
@ -60,7 +58,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLFieldSetElement)
nsIConstraintValidation)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLFieldSetElement,
nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLFieldSetElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLFieldSetElement)

View File

@ -60,7 +60,6 @@ public:
NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission);
virtual bool IsDisabledForEvents(uint32_t aMessage);
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
const nsIContent* GetFirstLegend() const { return mFirstLegend; }

View File

@ -13,7 +13,6 @@
#include "nsContentUtils.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Font)
DOMCI_NODE_DATA(HTMLFontElement, mozilla::dom::HTMLFontElement)
namespace mozilla {
namespace dom {
@ -36,7 +35,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLFontElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLFontElement, nsIDOMHTMLFontElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLFontElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLFontElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLFontElement)

View File

@ -69,7 +69,6 @@ public:
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:

View File

@ -10,7 +10,6 @@
class nsIDOMDocument;
NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(Frame)
DOMCI_NODE_DATA(HTMLFrameElement, mozilla::dom::HTMLFrameElement)
namespace mozilla {
namespace dom {
@ -36,7 +35,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLFrameElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLFrameElement, nsIDOMHTMLFrameElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLFrameElement,
nsGenericHTMLFrameElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLFrameElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLFrameElement)

View File

@ -46,7 +46,6 @@ public:
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL API

View File

@ -9,7 +9,6 @@
#include "nsGlobalWindow.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(FrameSet)
DOMCI_NODE_DATA(HTMLFrameSetElement, mozilla::dom::HTMLFrameSetElement)
namespace mozilla {
namespace dom {
@ -34,7 +33,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLFrameSetElement)
nsIDOMHTMLFrameSetElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLFrameSetElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLFrameSetElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLFrameSetElement)

View File

@ -148,7 +148,6 @@ public:
int32_t aModType) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:

View File

@ -7,7 +7,6 @@
#include "mozilla/dom/HTMLHRElementBinding.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(HR)
DOMCI_NODE_DATA(HTMLHRElement, mozilla::dom::HTMLHRElement)
namespace mozilla {
namespace dom {
@ -31,7 +30,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLHRElement)
nsIDOMHTMLHRElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLHRElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLHRElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLHRElement)

View File

@ -46,7 +46,6 @@ public:
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL API

View File

@ -13,7 +13,6 @@
#include "nsRuleData.h"
#include "mozAutoDocUpdate.h"
DOMCI_NODE_DATA(HTMLHeadingElement, mozilla::dom::HTMLHeadingElement)
NS_IMPL_NS_NEW_HTML_ELEMENT(Heading)
namespace mozilla {
@ -32,7 +31,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLHeadingElement)
nsIDOMHTMLHeadingElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLHeadingElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLHeadingElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLHeadingElement)

View File

@ -45,7 +45,6 @@ public:
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
// The XPCOM versions of GetAlign and SetAlign are fine for us for

View File

@ -66,8 +66,6 @@ NS_NewHTMLImageElement(already_AddRefed<nsINodeInfo> aNodeInfo,
return new mozilla::dom::HTMLImageElement(nodeInfo.forget());
}
DOMCI_NODE_DATA(HTMLImageElement, mozilla::dom::HTMLImageElement)
namespace mozilla {
namespace dom {
@ -98,7 +96,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLImageElement)
imgINotificationObserver)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLImageElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLImageElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLImageElement)

View File

@ -84,7 +84,6 @@ public:
nsresult CopyInnerTo(Element* aDest);
void MaybeLoadImage();
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
bool IsMap()

View File

@ -13,7 +13,6 @@
#include "nsRuleData.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(LI)
DOMCI_NODE_DATA(HTMLLIElement, mozilla::dom::HTMLLIElement)
namespace mozilla {
namespace dom {
@ -31,7 +30,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLLIElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLLIElement, nsIDOMHTMLLIElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLLIElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLLIElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLLIElement)

View File

@ -46,7 +46,6 @@ public:
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL API

View File

@ -14,7 +14,6 @@
// construction, destruction
NS_IMPL_NS_NEW_HTML_ELEMENT(Label)
DOMCI_NODE_DATA(HTMLLabelElement, mozilla::dom::HTMLLabelElement)
namespace mozilla {
namespace dom {
@ -41,7 +40,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLLabelElement)
nsIDOMHTMLLabelElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLLabelElement,
nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLLabelElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
// nsIDOMHTMLLabelElement

View File

@ -73,8 +73,6 @@ public:
bool aIsTrustedEvent);
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
nsGenericHTMLElement* GetLabeledElement() const;

View File

@ -10,8 +10,6 @@
#include "nsIFrame.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Legend)
DOMCI_NODE_DATA(HTMLLegendElement, mozilla::dom::HTMLLegendElement)
namespace mozilla {
namespace dom {
@ -31,7 +29,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLLegendElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLLegendElement, nsIDOMHTMLLegendElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLLegendElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLLegendElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
// nsIDOMHTMLLegendElement

View File

@ -78,8 +78,6 @@ public:
return fieldsetControl ? fieldsetControl->GetFormElement() : nullptr;
}
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
/**

View File

@ -25,7 +25,6 @@
#include "nsAsyncDOMEvent.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Link)
DOMCI_NODE_DATA(HTMLLinkElement, mozilla::dom::HTMLLinkElement)
namespace mozilla {
namespace dom {
@ -64,7 +63,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLLinkElement)
Link)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLLinkElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLLinkElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLLinkElement)

View File

@ -57,7 +57,6 @@ public:
// nsINode
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual JSObject*
WrapNode(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap) MOZ_OVERRIDE;

View File

@ -12,8 +12,6 @@
NS_IMPL_NS_NEW_HTML_ELEMENT(Map)
DOMCI_NODE_DATA(HTMLMapElement, mozilla::dom::HTMLMapElement)
namespace mozilla {
namespace dom {
@ -37,7 +35,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLMapElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLMapElement, nsIDOMHTMLMapElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLMapElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLMapElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLMapElement)

View File

@ -42,8 +42,6 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_NO_UNLINK(HTMLMapElement,
nsGenericHTMLElement)
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
// XPCOM GetName is fine.

View File

@ -11,7 +11,6 @@
#include "nsAttrValueInlines.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Menu)
DOMCI_NODE_DATA(HTMLMenuElement, mozilla::dom::HTMLMenuElement)
namespace mozilla {
namespace dom {
@ -64,7 +63,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLMenuElement)
nsIHTMLMenu)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLMenuElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLMenuElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLMenuElement)

View File

@ -48,8 +48,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
uint8_t GetType() const { return mType; }

View File

@ -10,7 +10,6 @@
NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(MenuItem)
DOMCI_NODE_DATA(HTMLMenuItemElement, mozilla::dom::HTMLMenuItemElement)
namespace mozilla {
namespace dom {
@ -182,7 +181,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLMenuItemElement)
nsIDOMHTMLMenuItemElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLMenuItemElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLMenuItemElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
//NS_IMPL_ELEMENT_CLONE(HTMLMenuItemElement)
nsresult

View File

@ -60,8 +60,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
uint8_t GetType() const { return mType; }

View File

@ -11,8 +11,6 @@
NS_IMPL_NS_NEW_HTML_ELEMENT(Meta)
DOMCI_NODE_DATA(HTMLMetaElement, mozilla::dom::HTMLMetaElement)
namespace mozilla {
namespace dom {
@ -36,7 +34,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLMetaElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLMetaElement, nsIDOMHTMLMetaElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLMetaElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLMetaElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLMetaElement)

View File

@ -43,8 +43,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
// XPCOM GetName is fine.

View File

@ -7,8 +7,6 @@
#include "mozilla/dom/HTMLMeterElementBinding.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Meter)
DOMCI_NODE_DATA(HTMLMeterElement, mozilla::dom::HTMLMeterElement)
namespace mozilla {
namespace dom {
@ -37,7 +35,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLMeterElement)
nsIDOMHTMLMeterElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLMeterElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLMeterElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLMeterElement)

View File

@ -46,8 +46,6 @@ public:
bool ParseAttribute(int32_t aNamespaceID, nsIAtom* aAttribute,
const nsAString& aValue, nsAttrValue& aResult);
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL

View File

@ -9,8 +9,6 @@
NS_IMPL_NS_NEW_HTML_ELEMENT(Mod)
DOMCI_NODE_DATA(HTMLModElement, mozilla::dom::HTMLModElement)
namespace mozilla {
namespace dom {
@ -34,7 +32,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLModElement)
nsIDOMHTMLModElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLModElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLModElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLModElement)

View File

@ -37,8 +37,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
void GetCite(nsString& aCite)

View File

@ -16,7 +16,6 @@
#include "nsHTMLSelectElement.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(OptGroup)
DOMCI_NODE_DATA(HTMLOptGroupElement, mozilla::dom::HTMLOptGroupElement)
namespace mozilla {
namespace dom {
@ -52,7 +51,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLOptGroupElement)
nsIDOMHTMLOptGroupElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLOptGroupElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLOptGroupElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLOptGroupElement)

View File

@ -46,8 +46,6 @@ public:
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsresult AfterSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAttrValue* aValue, bool aNotify);

View File

@ -56,8 +56,6 @@ NS_NewHTMLOptionElement(already_AddRefed<nsINodeInfo> aNodeInfo,
return new mozilla::dom::HTMLOptionElement(nodeInfo.forget());
}
DOMCI_NODE_DATA(HTMLOptionElement, mozilla::dom::HTMLOptionElement)
namespace mozilla {
namespace dom {
@ -90,7 +88,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLOptionElement)
nsIDOMHTMLOptionElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLOptionElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLOptionElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLOptionElement)

View File

@ -74,8 +74,6 @@ public:
nsresult CopyInnerTo(mozilla::dom::Element* aDest);
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual bool IsDisabled() const {

View File

@ -13,7 +13,6 @@
#include "nsHTMLFormElement.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Output)
DOMCI_NODE_DATA(HTMLOutputElement, mozilla::dom::HTMLOutputElement)
namespace mozilla {
namespace dom {
@ -61,7 +60,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLOutputElement)
nsIConstraintValidation)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLOutputElement,
nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLOutputElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLOutputElement)

View File

@ -71,8 +71,6 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(HTMLOutputElement,
nsGenericHTMLFormElement)
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual JSObject*
WrapNode(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap) MOZ_OVERRIDE;

View File

@ -12,7 +12,6 @@
NS_IMPL_NS_NEW_HTML_ELEMENT(Paragraph)
DOMCI_NODE_DATA(HTMLParagraphElement, mozilla::dom::HTMLParagraphElement)
namespace mozilla {
namespace dom {
@ -30,7 +29,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLParagraphElement)
nsIDOMHTMLParagraphElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLParagraphElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLParagraphElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLParagraphElement)

View File

@ -49,8 +49,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL API

View File

@ -13,7 +13,6 @@
#include "nsRuleData.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Pre)
DOMCI_NODE_DATA(HTMLPreElement, mozilla::dom::HTMLPreElement)
namespace mozilla {
namespace dom {
@ -30,7 +29,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLPreElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLPreElement, nsIDOMHTMLPreElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLPreElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLPreElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLPreElement)

View File

@ -50,8 +50,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL API

View File

@ -7,7 +7,6 @@
#include "mozilla/dom/HTMLProgressElementBinding.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Progress)
DOMCI_NODE_DATA(HTMLProgressElement, mozilla::dom::HTMLProgressElement)
namespace mozilla {
namespace dom {
@ -39,7 +38,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLProgressElement)
nsIDOMHTMLProgressElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLProgressElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLProgressElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLProgressElement)

View File

@ -45,8 +45,6 @@ public:
bool ParseAttribute(int32_t aNamespaceID, nsIAtom* aAttribute,
const nsAString& aValue, nsAttrValue& aResult);
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL

View File

@ -26,8 +26,6 @@
NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(Script)
DOMCI_NODE_DATA(HTMLScriptElement, mozilla::dom::HTMLScriptElement)
namespace mozilla {
namespace dom {
@ -63,7 +61,6 @@ NS_INTERFACE_TABLE_HEAD(HTMLScriptElement)
nsIMutationObserver)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLScriptElement,
nsGenericHTMLElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(HTMLScriptElement)
NS_HTML_CONTENT_INTERFACE_MAP_END

View File

@ -69,8 +69,6 @@ public:
virtual nsresult AfterSetAttr(int32_t aNamespaceID, nsIAtom* aName,
const nsAttrValue* aValue, bool aNotify);
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL

View File

@ -18,12 +18,6 @@
#include "nsContentUtils.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Shared)
DOMCI_DATA(HTMLParamElement, mozilla::dom::HTMLSharedElement)
DOMCI_DATA(HTMLBaseElement, mozilla::dom::HTMLSharedElement)
DOMCI_DATA(HTMLDirectoryElement, mozilla::dom::HTMLSharedElement)
DOMCI_DATA(HTMLQuoteElement, mozilla::dom::HTMLSharedElement)
DOMCI_DATA(HTMLHeadElement, mozilla::dom::HTMLSharedElement)
DOMCI_DATA(HTMLHtmlElement, mozilla::dom::HTMLSharedElement)
namespace mozilla {
namespace dom {
@ -37,33 +31,6 @@ HTMLSharedElement::~HTMLSharedElement()
NS_IMPL_ADDREF_INHERITED(HTMLSharedElement, Element)
NS_IMPL_RELEASE_INHERITED(HTMLSharedElement, Element)
nsIClassInfo*
HTMLSharedElement::GetClassInfoInternal()
{
if (mNodeInfo->Equals(nsGkAtoms::param)) {
return NS_GetDOMClassInfoInstance(eDOMClassInfo_HTMLParamElement_id);
}
if (mNodeInfo->Equals(nsGkAtoms::base)) {
return NS_GetDOMClassInfoInstance(eDOMClassInfo_HTMLBaseElement_id);
}
if (mNodeInfo->Equals(nsGkAtoms::dir)) {
return NS_GetDOMClassInfoInstance(eDOMClassInfo_HTMLDirectoryElement_id);
}
if (mNodeInfo->Equals(nsGkAtoms::q)) {
return NS_GetDOMClassInfoInstance(eDOMClassInfo_HTMLQuoteElement_id);
}
if (mNodeInfo->Equals(nsGkAtoms::blockquote)) {
return NS_GetDOMClassInfoInstance(eDOMClassInfo_HTMLQuoteElement_id);
}
if (mNodeInfo->Equals(nsGkAtoms::head)) {
return NS_GetDOMClassInfoInstance(eDOMClassInfo_HTMLHeadElement_id);
}
if (mNodeInfo->Equals(nsGkAtoms::html)) {
return NS_GetDOMClassInfoInstance(eDOMClassInfo_HTMLHtmlElement_id);
}
return nullptr;
}
// QueryInterface implementation for HTMLSharedElement
NS_INTERFACE_TABLE_HEAD(HTMLSharedElement)
NS_HTML_CONTENT_INTERFACE_TABLE_AMBIGUOUS_BEGIN(HTMLSharedElement,
@ -79,8 +46,6 @@ NS_INTERFACE_TABLE_HEAD(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_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_GETTER(GetClassInfoInternal)
NS_HTML_CONTENT_INTERFACE_MAP_END

View File

@ -97,12 +97,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo()
{
return static_cast<nsXPCClassInfo*>(GetClassInfoInternal());
}
nsIClassInfo* GetClassInfoInternal();
virtual nsIDOMNode* AsDOMNode()
{
return static_cast<nsIDOMHTMLParamElement*>(this);

View File

@ -17,9 +17,6 @@
#include "nsRuleData.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(SharedList)
DOMCI_DATA(HTMLOListElement, mozilla::dom::HTMLSharedListElement)
DOMCI_DATA(HTMLDListElement, mozilla::dom::HTMLSharedListElement)
DOMCI_DATA(HTMLUListElement, mozilla::dom::HTMLSharedListElement)
namespace mozilla {
namespace dom {
@ -31,21 +28,6 @@ HTMLSharedListElement::~HTMLSharedListElement()
NS_IMPL_ADDREF_INHERITED(HTMLSharedListElement, Element)
NS_IMPL_RELEASE_INHERITED(HTMLSharedListElement, Element)
nsIClassInfo*
HTMLSharedListElement::GetClassInfoInternal()
{
if (mNodeInfo->Equals(nsGkAtoms::ol)) {
return NS_GetDOMClassInfoInstance(eDOMClassInfo_HTMLOListElement_id);
}
if (mNodeInfo->Equals(nsGkAtoms::dl)) {
return NS_GetDOMClassInfoInstance(eDOMClassInfo_HTMLDListElement_id);
}
if (mNodeInfo->Equals(nsGkAtoms::ul)) {
return NS_GetDOMClassInfoInstance(eDOMClassInfo_HTMLUListElement_id);
}
return nullptr;
}
// QueryInterface implementation for nsHTMLSharedListElement
NS_INTERFACE_TABLE_HEAD(HTMLSharedListElement)
NS_HTML_CONTENT_INTERFACE_TABLE_AMBIGUOUS_BEGIN(HTMLSharedListElement,
@ -57,8 +39,6 @@ NS_INTERFACE_TABLE_HEAD(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_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_GETTER(GetClassInfoInternal)
NS_HTML_CONTENT_INTERFACE_MAP_END

View File

@ -56,11 +56,6 @@ public:
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsXPCClassInfo* GetClassInfo()
{
return static_cast<nsXPCClassInfo*>(GetClassInfoInternal());
}
nsIClassInfo* GetClassInfoInternal();
virtual nsIDOMNode* AsDOMNode()
{

View File

@ -8,7 +8,6 @@
#include "mozilla/dom/HTMLSourceElementBinding.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Source)
DOMCI_NODE_DATA(HTMLSourceElement, mozilla::dom::HTMLSourceElement)
namespace mozilla {
namespace dom {
@ -34,7 +33,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLSourceElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLSourceElement, nsIDOMHTMLSourceElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLSourceElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLSourceElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLSourceElement)

View File

@ -44,8 +44,6 @@ public:
nsIContent* aBindingParent,
bool aCompileEventHandlers);
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL

View File

@ -12,7 +12,6 @@
#include "nsRuleData.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Span)
DOMCI_NODE_DATA(HTMLSpanElement, mozilla::dom::HTMLSpanElement)
namespace mozilla {
namespace dom {
@ -29,7 +28,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLSpanElement)
NS_HTML_CONTENT_INTERFACE_TABLE0(HTMLSpanElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLSpanElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLSpanElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLSpanElement)

View File

@ -42,8 +42,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:

View File

@ -19,8 +19,6 @@
NS_IMPL_NS_NEW_HTML_ELEMENT(Style)
DOMCI_NODE_DATA(HTMLStyleElement, mozilla::dom::HTMLStyleElement)
namespace mozilla {
namespace dom {
@ -57,8 +55,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLStyleElement)
nsIMutationObserver)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLStyleElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLStyleElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLStyleElement)

View File

@ -95,8 +95,6 @@ public:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,
bool *aTriedToWrap);
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
already_AddRefed<nsIURI> GetStyleSheetURL(bool* aIsInline);

View File

@ -12,7 +12,6 @@
#include "mozilla/dom/HTMLTableCaptionElementBinding.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(TableCaption)
DOMCI_NODE_DATA(HTMLTableCaptionElement, mozilla::dom::HTMLTableCaptionElement)
namespace mozilla {
namespace dom {
@ -37,7 +36,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLTableCaptionElement)
nsIDOMHTMLTableCaptionElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableCaptionElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLTableCaptionElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLTableCaptionElement)

View File

@ -55,8 +55,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:

View File

@ -16,7 +16,6 @@
#include "mozilla/dom/HTMLTableCellElementBinding.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(TableCell)
DOMCI_NODE_DATA(HTMLTableCellElement, mozilla::dom::HTMLTableCellElement)
namespace mozilla {
namespace dom {
@ -41,7 +40,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLTableCellElement)
nsIDOMHTMLTableCellElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableCellElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLTableCellElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLTableCellElement)

View File

@ -164,8 +164,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope,

View File

@ -12,7 +12,6 @@
#include "mozilla/dom/HTMLTableColElementBinding.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(TableCol)
DOMCI_NODE_DATA(HTMLTableColElement, mozilla::dom::HTMLTableColElement)
namespace mozilla {
namespace dom {
@ -41,7 +40,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLTableColElement)
nsIDOMHTMLTableColElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableColElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLTableColElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLTableColElement)

View File

@ -96,8 +96,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:

View File

@ -16,7 +16,6 @@
#include "nsContentUtils.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Table)
DOMCI_NODE_DATA(HTMLTableElement, mozilla::dom::HTMLTableElement)
namespace mozilla {
namespace dom {
@ -104,7 +103,6 @@ NS_INTERFACE_TABLE_HEAD(TableRowsCollection)
NS_INTERFACE_TABLE2(TableRowsCollection, nsIHTMLCollection,
nsIDOMHTMLCollection)
NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(TableRowsCollection)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(HTMLCollection)
NS_INTERFACE_MAP_END
// Macro that can be used to avoid copy/pasting code to iterate over the
@ -348,7 +346,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableElement)
NS_HTML_CONTENT_INTERFACE_TABLE1(HTMLTableElement, nsIDOMHTMLTableElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLTableElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLTableElement)

View File

@ -181,7 +181,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,

View File

@ -16,7 +16,6 @@
#include "nsContentUtils.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(TableRow)
DOMCI_NODE_DATA(HTMLTableRowElement, mozilla::dom::HTMLTableRowElement)
namespace mozilla {
namespace dom {
@ -42,7 +41,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableRowElement)
nsIDOMHTMLTableRowElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableRowElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLTableRowElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLTableRowElement)

View File

@ -99,8 +99,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_NO_UNLINK(HTMLTableRowElement,

View File

@ -14,7 +14,6 @@
#include "nsContentUtils.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(TableSection)
DOMCI_NODE_DATA(HTMLTableSectionElement, mozilla::dom::HTMLTableSectionElement)
namespace mozilla {
namespace dom {
@ -42,7 +41,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableSectionElement)
nsIDOMHTMLTableSectionElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTableSectionElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLTableSectionElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLTableSectionElement)

View File

@ -87,8 +87,6 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_NO_UNLINK(HTMLTableSectionElement,
nsGenericHTMLElement)
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
JSObject* WrapNode(JSContext *aCx, JSObject *aScope, bool *aTriedToWrap);

View File

@ -46,8 +46,6 @@ static NS_DEFINE_CID(kXULControllersCID, NS_XULCONTROLLERS_CID);
NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(TextArea)
DOMCI_NODE_DATA(HTMLTextAreaElement, mozilla::dom::HTMLTextAreaElement)
namespace mozilla {
namespace dom {
@ -105,7 +103,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTextAreaElement)
nsIConstraintValidation)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTextAreaElement,
nsGenericHTMLFormElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLTextAreaElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
// nsIDOMHTMLTextAreaElement

View File

@ -147,8 +147,6 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(HTMLTextAreaElement,
nsGenericHTMLFormElement)
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
// nsIConstraintValidation

View File

@ -35,8 +35,6 @@ NS_IMPL_RELEASE_INHERITED(HTMLTitleElement, Element)
} // namespace dom
} // namespace mozilla
DOMCI_NODE_DATA(HTMLTitleElement, mozilla::dom::HTMLTitleElement)
namespace mozilla {
namespace dom {
@ -47,7 +45,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLTitleElement)
nsIMutationObserver)
NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLTitleElement,
nsGenericHTMLElement)
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLTitleElement)
NS_HTML_CONTENT_INTERFACE_MAP_END
NS_IMPL_ELEMENT_CLONE(HTMLTitleElement)

Some files were not shown because too many files have changed in this diff Show More