Bug 1118608 - Mark virtual overridden functions as MOZ_OVERRIDE in dom/xbl; r=baku
--- a/dom/xbl/XBLChildrenElement.cpp
+++ b/dom/xbl/XBLChildrenElement.cpp
@@ -21,28 +21,16 @@ NS_IMPL_RELEASE_INHERITED(XBLChildrenEle
NS_INTERFACE_TABLE_HEAD(XBLChildrenElement)
NS_INTERFACE_TABLE_INHERITED(XBLChildrenElement, nsIDOMNode,
nsIDOMElement)
NS_ELEMENT_INTERFACE_TABLE_TO_MAP_SEGUE
NS_INTERFACE_MAP_END_INHERITING(Element)
NS_IMPL_ELEMENT_CLONE(XBLChildrenElement)
-nsIAtom*
-XBLChildrenElement::GetIDAttributeName() const
-{
- return nullptr;
-}
-
-nsIAtom*
-XBLChildrenElement::DoGetID() const
-{
- return nullptr;
-}
-
nsresult
XBLChildrenElement::UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify)
{
if (aAttribute == nsGkAtoms::includes &&
aNameSpaceID == kNameSpaceID_None) {
mIncludes.Clear();
}
--- a/dom/xbl/XBLChildrenElement.h
+++ b/dom/xbl/XBLChildrenElement.h
@@ -30,31 +30,27 @@ public:
: nsXMLElement(aNodeInfo)
{
}
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
// nsINode interface methods
- virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const;
+ virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
- virtual nsXPCClassInfo* GetClassInfo() { return nullptr; }
-
- virtual nsIDOMNode* AsDOMNode() { return this; }
+ virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
// nsIContent interface methods
- virtual nsIAtom *GetIDAttributeName() const;
- virtual nsIAtom* DoGetID() const;
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
- bool aNotify);
+ bool aNotify) MOZ_OVERRIDE;
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
- nsAttrValue& aResult);
+ nsAttrValue& aResult) MOZ_OVERRIDE;
void AppendInsertedChild(nsIContent* aChild)
{
mInsertedChildren.AppendElement(aChild);
aChild->SetXBLInsertionParent(GetParent());
// Appending an inserted child causes the inserted
// children to be projected instead of default content.
@@ -171,19 +167,19 @@ public:
}
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsAnonymousContentList)
// nsIDOMNodeList interface
NS_DECL_NSIDOMNODELIST
// nsINodeList interface
- virtual int32_t IndexOf(nsIContent* aContent);
- virtual nsINode* GetParentObject() { return mParent; }
- virtual nsIContent* Item(uint32_t aIndex);
+ virtual int32_t IndexOf(nsIContent* aContent) MOZ_OVERRIDE;
+ virtual nsINode* GetParentObject() MOZ_OVERRIDE { return mParent; }
+ virtual nsIContent* Item(uint32_t aIndex) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
bool IsListFor(nsIContent* aContent) {
return mParent == aContent;
}
private: