зеркало из https://github.com/mozilla/gecko-dev.git
bug 1122254 - use MOZ_OVERRIDE more in dom/ r=bz
This commit is contained in:
Trevor Saunders
Родитель
8cb9eae58a
Коммит
d99d1a045b
|
|
@ -1296,7 +1296,7 @@ public:
|
|||
nsIContent* aContent,
|
||||
nsIDocument* aDoc);
|
||||
|
||||
NS_IMETHOD Run();
|
||||
NS_IMETHOD Run() MOZ_OVERRIDE;
|
||||
private:
|
||||
virtual ~RemoveFromBindingManagerRunnable();
|
||||
nsRefPtr<nsBindingManager> mManager;
|
||||
|
|
|
|||
|
|
@ -148,7 +148,8 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
bool ToObject(JSContext* aCx, JS::MutableHandle<JSObject*> aObjp);
|
||||
virtual bool ToObject(JSContext* aCx, JS::MutableHandle<JSObject*> aObjp)
|
||||
MOZ_OVERRIDE;
|
||||
|
||||
private:
|
||||
JS::Rooted<JSObject*> mObj;
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ public:
|
|||
: mReport(aReport)
|
||||
{}
|
||||
|
||||
NS_IMETHOD Run()
|
||||
NS_IMETHOD Run() MOZ_OVERRIDE
|
||||
{
|
||||
mReport->LogToConsole();
|
||||
return NS_OK;
|
||||
|
|
|
|||
|
|
@ -317,25 +317,25 @@ public:
|
|||
|
||||
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
|
||||
|
||||
NS_IMETHOD GetTitle(nsAString& aTitle) MOZ_FINAL {
|
||||
NS_IMETHOD GetTitle(nsAString& aTitle) MOZ_FINAL MOZ_OVERRIDE {
|
||||
nsString title;
|
||||
GetTitle(title);
|
||||
aTitle.Assign(title);
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD GetLang(nsAString& aLang) MOZ_FINAL {
|
||||
NS_IMETHOD GetLang(nsAString& aLang) MOZ_FINAL MOZ_OVERRIDE {
|
||||
nsString lang;
|
||||
GetLang(lang);
|
||||
aLang.Assign(lang);
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD GetDir(nsAString& aDir) MOZ_FINAL {
|
||||
NS_IMETHOD GetDir(nsAString& aDir) MOZ_FINAL MOZ_OVERRIDE {
|
||||
nsString dir;
|
||||
GetDir(dir);
|
||||
aDir.Assign(dir);
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD SetDir(const nsAString& aDir) MOZ_FINAL {
|
||||
NS_IMETHOD SetDir(const nsAString& aDir) MOZ_FINAL MOZ_OVERRIDE {
|
||||
mozilla::ErrorResult rv;
|
||||
SetDir(aDir, rv);
|
||||
return rv.ErrorCode();
|
||||
|
|
@ -348,131 +348,137 @@ public:
|
|||
SetClassName(aClassName);
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD GetDataset(nsISupports** aDataset) MOZ_FINAL;
|
||||
NS_IMETHOD GetHidden(bool* aHidden) MOZ_FINAL {
|
||||
NS_IMETHOD GetDataset(nsISupports** aDataset) MOZ_FINAL MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetHidden(bool* aHidden) MOZ_FINAL MOZ_OVERRIDE {
|
||||
*aHidden = Hidden();
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD SetHidden(bool aHidden) MOZ_FINAL {
|
||||
NS_IMETHOD SetHidden(bool aHidden) MOZ_FINAL MOZ_OVERRIDE {
|
||||
mozilla::ErrorResult rv;
|
||||
SetHidden(aHidden, rv);
|
||||
return rv.ErrorCode();
|
||||
}
|
||||
NS_IMETHOD DOMBlur() MOZ_FINAL {
|
||||
NS_IMETHOD DOMBlur() MOZ_FINAL MOZ_OVERRIDE {
|
||||
mozilla::ErrorResult rv;
|
||||
Blur(rv);
|
||||
return rv.ErrorCode();
|
||||
}
|
||||
NS_IMETHOD GetItemScope(bool* aItemScope) MOZ_FINAL {
|
||||
NS_IMETHOD GetItemScope(bool* aItemScope) MOZ_FINAL MOZ_OVERRIDE {
|
||||
*aItemScope = ItemScope();
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD SetItemScope(bool aItemScope) MOZ_FINAL {
|
||||
NS_IMETHOD SetItemScope(bool aItemScope) MOZ_FINAL MOZ_OVERRIDE {
|
||||
mozilla::ErrorResult rv;
|
||||
SetItemScope(aItemScope, rv);
|
||||
return rv.ErrorCode();
|
||||
}
|
||||
NS_IMETHOD GetItemType(nsIVariant** aType) MOZ_FINAL {
|
||||
NS_IMETHOD GetItemType(nsIVariant** aType) MOZ_FINAL MOZ_OVERRIDE {
|
||||
GetTokenList(nsGkAtoms::itemtype, aType);
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD SetItemType(nsIVariant* aType) MOZ_FINAL {
|
||||
NS_IMETHOD SetItemType(nsIVariant* aType) MOZ_FINAL MOZ_OVERRIDE {
|
||||
return SetTokenList(nsGkAtoms::itemtype, aType);
|
||||
}
|
||||
NS_IMETHOD GetItemId(nsAString& aId) MOZ_FINAL {
|
||||
NS_IMETHOD GetItemId(nsAString& aId) MOZ_FINAL MOZ_OVERRIDE {
|
||||
nsString id;
|
||||
GetItemId(id);
|
||||
aId.Assign(aId);
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD SetItemId(const nsAString& aId) MOZ_FINAL {
|
||||
NS_IMETHOD SetItemId(const nsAString& aId) MOZ_FINAL MOZ_OVERRIDE {
|
||||
mozilla::ErrorResult rv;
|
||||
SetItemId(aId, rv);
|
||||
return rv.ErrorCode();
|
||||
}
|
||||
NS_IMETHOD GetProperties(nsISupports** aReturn) MOZ_FINAL;
|
||||
NS_IMETHOD GetItemValue(nsIVariant** aValue) MOZ_FINAL;
|
||||
NS_IMETHOD SetItemValue(nsIVariant* aValue) MOZ_FINAL;
|
||||
NS_IMETHOD GetItemRef(nsIVariant** aRef) MOZ_FINAL {
|
||||
NS_IMETHOD GetProperties(nsISupports** aReturn) MOZ_FINAL MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetItemValue(nsIVariant** aValue) MOZ_FINAL MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetItemValue(nsIVariant* aValue) MOZ_FINAL MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetItemRef(nsIVariant** aRef) MOZ_FINAL MOZ_OVERRIDE {
|
||||
GetTokenList(nsGkAtoms::itemref, aRef);
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD SetItemRef(nsIVariant* aRef) MOZ_FINAL {
|
||||
NS_IMETHOD SetItemRef(nsIVariant* aRef) MOZ_FINAL MOZ_OVERRIDE {
|
||||
return SetTokenList(nsGkAtoms::itemref, aRef);
|
||||
}
|
||||
NS_IMETHOD GetItemProp(nsIVariant** aProp) MOZ_FINAL {
|
||||
NS_IMETHOD GetItemProp(nsIVariant** aProp) MOZ_FINAL MOZ_OVERRIDE {
|
||||
GetTokenList(nsGkAtoms::itemprop, aProp);
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD SetItemProp(nsIVariant* aProp) MOZ_FINAL {
|
||||
NS_IMETHOD SetItemProp(nsIVariant* aProp) MOZ_FINAL MOZ_OVERRIDE {
|
||||
return SetTokenList(nsGkAtoms::itemprop, aProp);
|
||||
}
|
||||
NS_IMETHOD GetAccessKey(nsAString& aAccessKey) MOZ_FINAL {
|
||||
NS_IMETHOD GetAccessKey(nsAString& aAccessKey) MOZ_FINAL MOZ_OVERRIDE {
|
||||
nsString accessKey;
|
||||
GetAccessKey(accessKey);
|
||||
aAccessKey.Assign(accessKey);
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD SetAccessKey(const nsAString& aAccessKey) MOZ_FINAL {
|
||||
NS_IMETHOD SetAccessKey(const nsAString& aAccessKey) MOZ_FINAL MOZ_OVERRIDE {
|
||||
mozilla::ErrorResult rv;
|
||||
SetAccessKey(aAccessKey, rv);
|
||||
return rv.ErrorCode();
|
||||
}
|
||||
NS_IMETHOD GetAccessKeyLabel(nsAString& aAccessKeyLabel) MOZ_FINAL {
|
||||
NS_IMETHOD GetAccessKeyLabel(nsAString& aAccessKeyLabel)
|
||||
MOZ_FINAL MOZ_OVERRIDE {
|
||||
nsString accessKeyLabel;
|
||||
GetAccessKeyLabel(accessKeyLabel);
|
||||
aAccessKeyLabel.Assign(accessKeyLabel);
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD SetDraggable(bool aDraggable) MOZ_FINAL {
|
||||
NS_IMETHOD SetDraggable(bool aDraggable) MOZ_FINAL MOZ_OVERRIDE {
|
||||
mozilla::ErrorResult rv;
|
||||
SetDraggable(aDraggable, rv);
|
||||
return rv.ErrorCode();
|
||||
}
|
||||
NS_IMETHOD GetContentEditable(nsAString& aContentEditable) MOZ_FINAL {
|
||||
NS_IMETHOD GetContentEditable(nsAString& aContentEditable)
|
||||
MOZ_FINAL MOZ_OVERRIDE {
|
||||
nsString contentEditable;
|
||||
GetContentEditable(contentEditable);
|
||||
aContentEditable.Assign(contentEditable);
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD SetContentEditable(const nsAString& aContentEditable) MOZ_FINAL {
|
||||
NS_IMETHOD SetContentEditable(const nsAString& aContentEditable)
|
||||
MOZ_FINAL MOZ_OVERRIDE {
|
||||
mozilla::ErrorResult rv;
|
||||
SetContentEditable(aContentEditable, rv);
|
||||
return rv.ErrorCode();
|
||||
}
|
||||
NS_IMETHOD GetIsContentEditable(bool* aIsContentEditable) MOZ_FINAL {
|
||||
NS_IMETHOD GetIsContentEditable(bool* aIsContentEditable)
|
||||
MOZ_FINAL MOZ_OVERRIDE {
|
||||
*aIsContentEditable = IsContentEditable();
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD GetContextMenu(nsIDOMHTMLMenuElement** aContextMenu) MOZ_FINAL;
|
||||
NS_IMETHOD GetSpellcheck(bool* aSpellcheck) MOZ_FINAL {
|
||||
NS_IMETHOD GetContextMenu(nsIDOMHTMLMenuElement** aContextMenu)
|
||||
MOZ_FINAL MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetSpellcheck(bool* aSpellcheck) MOZ_FINAL MOZ_OVERRIDE {
|
||||
*aSpellcheck = Spellcheck();
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD SetSpellcheck(bool aSpellcheck) MOZ_FINAL {
|
||||
NS_IMETHOD SetSpellcheck(bool aSpellcheck) MOZ_FINAL MOZ_OVERRIDE {
|
||||
mozilla::ErrorResult rv;
|
||||
SetSpellcheck(aSpellcheck, rv);
|
||||
return rv.ErrorCode();
|
||||
}
|
||||
NS_IMETHOD GetOuterHTML(nsAString& aOuterHTML) MOZ_FINAL {
|
||||
NS_IMETHOD GetOuterHTML(nsAString& aOuterHTML) MOZ_FINAL MOZ_OVERRIDE {
|
||||
mozilla::dom::Element::GetOuterHTML(aOuterHTML);
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD SetOuterHTML(const nsAString& aOuterHTML) MOZ_FINAL {
|
||||
NS_IMETHOD SetOuterHTML(const nsAString& aOuterHTML) MOZ_FINAL MOZ_OVERRIDE {
|
||||
mozilla::ErrorResult rv;
|
||||
mozilla::dom::Element::SetOuterHTML(aOuterHTML, rv);
|
||||
return rv.ErrorCode();
|
||||
} \
|
||||
NS_IMETHOD InsertAdjacentHTML(const nsAString& position,
|
||||
const nsAString& text) MOZ_FINAL;
|
||||
NS_IMETHOD ScrollIntoView(bool top, uint8_t _argc) MOZ_FINAL {
|
||||
const nsAString& text) MOZ_FINAL MOZ_OVERRIDE;
|
||||
NS_IMETHOD ScrollIntoView(bool top, uint8_t _argc) MOZ_FINAL MOZ_OVERRIDE {
|
||||
if (!_argc) {
|
||||
top = true;
|
||||
}
|
||||
mozilla::dom::Element::ScrollIntoView(top);
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD GetOffsetParent(nsIDOMElement** aOffsetParent) MOZ_FINAL {
|
||||
NS_IMETHOD GetOffsetParent(nsIDOMElement** aOffsetParent)
|
||||
MOZ_FINAL MOZ_OVERRIDE {
|
||||
mozilla::dom::Element* offsetParent = GetOffsetParent();
|
||||
if (!offsetParent) {
|
||||
*aOffsetParent = nullptr;
|
||||
|
|
@ -480,41 +486,41 @@ public:
|
|||
}
|
||||
return CallQueryInterface(offsetParent, aOffsetParent);
|
||||
}
|
||||
NS_IMETHOD GetOffsetTop(int32_t* aOffsetTop) MOZ_FINAL {
|
||||
NS_IMETHOD GetOffsetTop(int32_t* aOffsetTop) MOZ_FINAL MOZ_OVERRIDE {
|
||||
*aOffsetTop = OffsetTop();
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD GetOffsetLeft(int32_t* aOffsetLeft) MOZ_FINAL {
|
||||
NS_IMETHOD GetOffsetLeft(int32_t* aOffsetLeft) MOZ_FINAL MOZ_OVERRIDE {
|
||||
*aOffsetLeft = OffsetLeft();
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD GetOffsetWidth(int32_t* aOffsetWidth) MOZ_FINAL {
|
||||
NS_IMETHOD GetOffsetWidth(int32_t* aOffsetWidth) MOZ_FINAL MOZ_OVERRIDE {
|
||||
*aOffsetWidth = OffsetWidth();
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD GetOffsetHeight(int32_t* aOffsetHeight) MOZ_FINAL {
|
||||
NS_IMETHOD GetOffsetHeight(int32_t* aOffsetHeight) MOZ_FINAL MOZ_OVERRIDE {
|
||||
*aOffsetHeight = OffsetHeight();
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD DOMClick() MOZ_FINAL {
|
||||
NS_IMETHOD DOMClick() MOZ_FINAL MOZ_OVERRIDE {
|
||||
Click();
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD GetTabIndex(int32_t* aTabIndex) MOZ_FINAL {
|
||||
NS_IMETHOD GetTabIndex(int32_t* aTabIndex) MOZ_FINAL MOZ_OVERRIDE {
|
||||
*aTabIndex = TabIndex();
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD SetTabIndex(int32_t aTabIndex) MOZ_FINAL {
|
||||
NS_IMETHOD SetTabIndex(int32_t aTabIndex) MOZ_FINAL MOZ_OVERRIDE {
|
||||
mozilla::ErrorResult rv;
|
||||
SetTabIndex(aTabIndex, rv);
|
||||
return rv.ErrorCode();
|
||||
}
|
||||
NS_IMETHOD Focus() MOZ_FINAL {
|
||||
NS_IMETHOD Focus() MOZ_FINAL MOZ_OVERRIDE {
|
||||
mozilla::ErrorResult rv;
|
||||
Focus(rv);
|
||||
return rv.ErrorCode();
|
||||
}
|
||||
NS_IMETHOD GetDraggable(bool* aDraggable) MOZ_FINAL {
|
||||
NS_IMETHOD GetDraggable(bool* aDraggable) MOZ_FINAL MOZ_OVERRIDE {
|
||||
*aDraggable = Draggable();
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
@ -522,7 +528,7 @@ public:
|
|||
return mozilla::dom::Element::GetInnerHTML(aInnerHTML);
|
||||
}
|
||||
using mozilla::dom::Element::SetInnerHTML;
|
||||
NS_IMETHOD SetInnerHTML(const nsAString& aInnerHTML) MOZ_FINAL {
|
||||
NS_IMETHOD SetInnerHTML(const nsAString& aInnerHTML) MOZ_FINAL MOZ_OVERRIDE {
|
||||
mozilla::ErrorResult rv;
|
||||
SetInnerHTML(aInnerHTML, rv);
|
||||
return rv.ErrorCode();
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче