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 1117264 - Mark virtual overridden functions as MOZ_OVERRIDE in dom/base code; r=baku

Browse Source
This commit is contained in:
Ehsan Akhgari 2015-01-02 21:13:39 -05:00
parent 033d1d7603
commit 1d3e35e67b
45 changed files with 310 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/base/Attr.h
View File

@ -79,7 +79,7 @@ public:
NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS_AMBIGUOUS(Attr,
nsIAttribute)
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
// WebIDL
virtual JSObject* WrapNode(JSContext* aCx) MOZ_OVERRIDE;
@ -98,7 +98,7 @@ public:
Element* GetOwnerElement(ErrorResult& aRv);
protected:
virtual Element* GetNameSpaceElement()
virtual Element* GetNameSpaceElement() MOZ_OVERRIDE
{
return GetElement();
}

2
dom/base/Comment.h
View File

@ -52,7 +52,7 @@ public:
// Empty interface
// nsINode
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
virtual nsGenericDOMDataNode* CloneDataNode(mozilla::dom::NodeInfo *aNodeInfo,
bool aCloneText) const MOZ_OVERRIDE;

8
dom/base/DOMQuad.cpp
View File

@ -84,25 +84,25 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(QuadBounds, DOMRectReadOnly)
NS_DECL_ISUPPORTS_INHERITED
virtual double X() const
virtual double X() const MOZ_OVERRIDE
{
double x1, x2;
GetHorizontalMinMax(&x1, &x2);
return x1;
}
virtual double Y() const
virtual double Y() const MOZ_OVERRIDE
{
double y1, y2;
GetVerticalMinMax(&y1, &y2);
return y1;
}
virtual double Width() const
virtual double Width() const MOZ_OVERRIDE
{
double x1, x2;
GetHorizontalMinMax(&x1, &x2);
return x2 - x1;
}
virtual double Height() const
virtual double Height() const MOZ_OVERRIDE
{
double y1, y2;
GetVerticalMinMax(&y1, &y2);

2
dom/base/DOMStringList.h
View File

@ -24,7 +24,7 @@ public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMStringList)
virtual JSObject* WrapObject(JSContext* aCx);
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
nsISupports* GetParentObject()
{
return nullptr;

2
dom/base/DocumentFragment.h
View File

@ -112,7 +112,7 @@ public:
return;
}
virtual Element* GetNameSpaceElement()
virtual Element* GetNameSpaceElement() MOZ_OVERRIDE
{
return nullptr;
}

102
dom/base/Element.h
View File

@ -159,7 +159,7 @@ public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_ELEMENT_IID)
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) MOZ_OVERRIDE;
/**
* Method to get the full state of this element. See mozilla/EventStates.h
@ -1211,7 +1211,7 @@ protected:
nsIFrame* GetStyledFrame();
virtual Element* GetNameSpaceElement()
virtual Element* GetNameSpaceElement() MOZ_OVERRIDE
{
return this;
}
@ -1311,9 +1311,9 @@ public:
NS_DECL_NSIDOMNODELIST
// nsINodeList
virtual nsIContent* Item(uint32_t aIndex);
virtual int32_t IndexOf(nsIContent* aContent);
virtual nsINode* GetParentObject() { return mParent; }
virtual nsIContent* Item(uint32_t aIndex) MOZ_OVERRIDE;
virtual int32_t IndexOf(nsIContent* aContent) MOZ_OVERRIDE;
virtual nsINode* GetParentObject() MOZ_OVERRIDE { return mParent; }
virtual uint32_t Length() const;
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
protected:
@ -1467,43 +1467,45 @@ _elementName::Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const
#define NS_FORWARD_NSIDOMELEMENT_TO_GENERIC \
typedef mozilla::dom::Element Element; \
NS_IMETHOD GetTagName(nsAString& aTagName) MOZ_FINAL \
NS_IMETHOD GetTagName(nsAString& aTagName) MOZ_FINAL MOZ_OVERRIDE \
{ \
Element::GetTagName(aTagName); \
return NS_OK; \
} \
NS_IMETHOD GetId(nsAString& aId) MOZ_FINAL \
NS_IMETHOD GetId(nsAString& aId) MOZ_FINAL MOZ_OVERRIDE \
{ \
Element::GetId(aId); \
return NS_OK; \
} \
NS_IMETHOD SetId(const nsAString& aId) MOZ_FINAL \
NS_IMETHOD SetId(const nsAString& aId) MOZ_FINAL MOZ_OVERRIDE \
{ \
Element::SetId(aId); \
return NS_OK; \
} \
NS_IMETHOD GetClassName(nsAString& aClassName) MOZ_FINAL \
NS_IMETHOD GetClassName(nsAString& aClassName) MOZ_FINAL MOZ_OVERRIDE \
{ \
Element::GetClassName(aClassName); \
return NS_OK; \
} \
NS_IMETHOD SetClassName(const nsAString& aClassName) MOZ_FINAL \
NS_IMETHOD SetClassName(const nsAString& aClassName) MOZ_FINAL MOZ_OVERRIDE \
{ \
Element::SetClassName(aClassName); \
return NS_OK; \
} \
NS_IMETHOD GetClassList(nsISupports** aClassList) MOZ_FINAL \
NS_IMETHOD GetClassList(nsISupports** aClassList) MOZ_FINAL MOZ_OVERRIDE \
{ \
Element::GetClassList(aClassList); \
return NS_OK; \
} \
NS_IMETHOD GetAttributes(nsIDOMMozNamedAttrMap** aAttributes) MOZ_FINAL \
MOZ_OVERRIDE \
{ \
NS_ADDREF(*aAttributes = Attributes()); \
return NS_OK; \
} \
using Element::GetAttribute; \
NS_IMETHOD GetAttribute(const nsAString& name, nsAString& _retval) MOZ_FINAL \
MOZ_OVERRIDE \
{ \
nsString attr; \
GetAttribute(name, attr); \
@ -1512,13 +1514,13 @@ NS_IMETHOD GetAttribute(const nsAString& name, nsAString& _retval) MOZ_FINAL \
} \
NS_IMETHOD GetAttributeNS(const nsAString& namespaceURI, \
const nsAString& localName, \
nsAString& _retval) MOZ_FINAL \
nsAString& _retval) MOZ_FINAL MOZ_OVERRIDE \
{ \
Element::GetAttributeNS(namespaceURI, localName, _retval); \
return NS_OK; \
} \
NS_IMETHOD SetAttribute(const nsAString& name, \
const nsAString& value) \
const nsAString& value) MOZ_OVERRIDE \
{ \
mozilla::ErrorResult rv; \
Element::SetAttribute(name, value, rv); \
@ -1526,14 +1528,14 @@ NS_IMETHOD SetAttribute(const nsAString& name, \
} \
NS_IMETHOD SetAttributeNS(const nsAString& namespaceURI, \
const nsAString& qualifiedName, \
const nsAString& value) MOZ_FINAL \
const nsAString& value) MOZ_FINAL MOZ_OVERRIDE \
{ \
mozilla::ErrorResult rv; \
Element::SetAttributeNS(namespaceURI, qualifiedName, value, rv); \
return rv.ErrorCode(); \
} \
using Element::RemoveAttribute; \
NS_IMETHOD RemoveAttribute(const nsAString& name) MOZ_FINAL \
NS_IMETHOD RemoveAttribute(const nsAString& name) MOZ_FINAL MOZ_OVERRIDE \
{ \
mozilla::ErrorResult rv; \
RemoveAttribute(name, rv); \
@ -1541,6 +1543,7 @@ NS_IMETHOD RemoveAttribute(const nsAString& name) MOZ_FINAL \
} \
NS_IMETHOD RemoveAttributeNS(const nsAString& namespaceURI, \
const nsAString& localName) MOZ_FINAL \
MOZ_OVERRIDE \
{ \
mozilla::ErrorResult rv; \
Element::RemoveAttributeNS(namespaceURI, localName, rv); \
@ -1548,31 +1551,31 @@ NS_IMETHOD RemoveAttributeNS(const nsAString& namespaceURI, \
} \
using Element::HasAttribute; \
NS_IMETHOD HasAttribute(const nsAString& name, \
bool* _retval) MOZ_FINAL \
bool* _retval) MOZ_FINAL MOZ_OVERRIDE \
{ \
*_retval = HasAttribute(name); \
return NS_OK; \
} \
NS_IMETHOD HasAttributeNS(const nsAString& namespaceURI, \
const nsAString& localName, \
bool* _retval) MOZ_FINAL \
bool* _retval) MOZ_FINAL MOZ_OVERRIDE \
{ \
*_retval = Element::HasAttributeNS(namespaceURI, localName); \
return NS_OK; \
} \
NS_IMETHOD HasAttributes(bool* _retval) MOZ_FINAL \
NS_IMETHOD HasAttributes(bool* _retval) MOZ_FINAL MOZ_OVERRIDE \
{ \
*_retval = Element::HasAttributes(); \
return NS_OK; \
} \
NS_IMETHOD GetAttributeNode(const nsAString& name, \
nsIDOMAttr** _retval) MOZ_FINAL \
nsIDOMAttr** _retval) MOZ_FINAL MOZ_OVERRIDE \
{ \
NS_IF_ADDREF(*_retval = Element::GetAttributeNode(name)); \
return NS_OK; \
} \
NS_IMETHOD SetAttributeNode(nsIDOMAttr* newAttr, \
nsIDOMAttr** _retval) MOZ_FINAL \
nsIDOMAttr** _retval) MOZ_FINAL MOZ_OVERRIDE \
{ \
if (!newAttr) { \
return NS_ERROR_INVALID_POINTER; \
@ -1583,7 +1586,7 @@ NS_IMETHOD SetAttributeNode(nsIDOMAttr* newAttr, \
return rv.ErrorCode(); \
} \
NS_IMETHOD RemoveAttributeNode(nsIDOMAttr* oldAttr, \
nsIDOMAttr** _retval) MOZ_FINAL \
nsIDOMAttr** _retval) MOZ_FINAL MOZ_OVERRIDE \
{ \
if (!oldAttr) { \
return NS_ERROR_INVALID_POINTER; \
@ -1595,14 +1598,14 @@ NS_IMETHOD RemoveAttributeNode(nsIDOMAttr* oldAttr, \
} \
NS_IMETHOD GetAttributeNodeNS(const nsAString& namespaceURI, \
const nsAString& localName, \
nsIDOMAttr** _retval) MOZ_FINAL \
nsIDOMAttr** _retval) MOZ_FINAL MOZ_OVERRIDE \
{ \
NS_IF_ADDREF(*_retval = Element::GetAttributeNodeNS(namespaceURI, \
localName)); \
return NS_OK; \
} \
NS_IMETHOD SetAttributeNodeNS(nsIDOMAttr* newAttr, \
nsIDOMAttr** _retval) MOZ_FINAL \
nsIDOMAttr** _retval) MOZ_FINAL MOZ_OVERRIDE \
{ \
mozilla::ErrorResult rv; \
mozilla::dom::Attr* attr = static_cast<mozilla::dom::Attr*>(newAttr); \
@ -1611,6 +1614,7 @@ NS_IMETHOD SetAttributeNodeNS(nsIDOMAttr* newAttr, \
} \
NS_IMETHOD GetElementsByTagName(const nsAString& name, \
nsIDOMHTMLCollection** _retval) MOZ_FINAL \
MOZ_OVERRIDE \
{ \
Element::GetElementsByTagName(name, _retval); \
return NS_OK; \
@ -1618,21 +1622,25 @@ NS_IMETHOD GetElementsByTagName(const nsAString& name, \
NS_IMETHOD GetElementsByTagNameNS(const nsAString& namespaceURI, \
const nsAString& localName, \
nsIDOMHTMLCollection** _retval) MOZ_FINAL \
MOZ_OVERRIDE\
{ \
return Element::GetElementsByTagNameNS(namespaceURI, localName, \
_retval); \
} \
NS_IMETHOD GetElementsByClassName(const nsAString& classes, \
nsIDOMHTMLCollection** _retval) MOZ_FINAL \
MOZ_OVERRIDE\
{ \
return Element::GetElementsByClassName(classes, _retval); \
} \
NS_IMETHOD GetChildElements(nsIDOMNodeList** aChildElements) MOZ_FINAL \
MOZ_OVERRIDE \
{ \
nsIHTMLCollection* list = FragmentOrElement::Children(); \
return CallQueryInterface(list, aChildElements); \
} \
NS_IMETHOD GetFirstElementChild(nsIDOMElement** aFirstElementChild) MOZ_FINAL \
MOZ_OVERRIDE \
{ \
Element* element = Element::GetFirstElementChild(); \
if (!element) { \
@ -1642,6 +1650,7 @@ NS_IMETHOD GetFirstElementChild(nsIDOMElement** aFirstElementChild) MOZ_FINAL \
return CallQueryInterface(element, aFirstElementChild); \
} \
NS_IMETHOD GetLastElementChild(nsIDOMElement** aLastElementChild) MOZ_FINAL \
MOZ_OVERRIDE \
{ \
Element* element = Element::GetLastElementChild(); \
if (!element) { \
@ -1651,7 +1660,7 @@ NS_IMETHOD GetLastElementChild(nsIDOMElement** aLastElementChild) MOZ_FINAL \
return CallQueryInterface(element, aLastElementChild); \
} \
NS_IMETHOD GetPreviousElementSibling(nsIDOMElement** aPreviousElementSibling) \
MOZ_FINAL \
MOZ_FINAL MOZ_OVERRIDE \
{ \
Element* element = Element::GetPreviousElementSibling(); \
if (!element) { \
@ -1661,7 +1670,7 @@ NS_IMETHOD GetPreviousElementSibling(nsIDOMElement** aPreviousElementSibling) \
return CallQueryInterface(element, aPreviousElementSibling); \
} \
NS_IMETHOD GetNextElementSibling(nsIDOMElement** aNextElementSibling) \
MOZ_FINAL \
MOZ_FINAL MOZ_OVERRIDE \
{ \
Element* element = Element::GetNextElementSibling(); \
if (!element) { \
@ -1671,121 +1680,124 @@ NS_IMETHOD GetNextElementSibling(nsIDOMElement** aNextElementSibling) \
return CallQueryInterface(element, aNextElementSibling); \
} \
NS_IMETHOD GetChildElementCount(uint32_t* aChildElementCount) MOZ_FINAL \
MOZ_OVERRIDE \
{ \
*aChildElementCount = Element::ChildElementCount(); \
return NS_OK; \
} \
NS_IMETHOD MozRemove() MOZ_FINAL \
NS_IMETHOD MozRemove() MOZ_FINAL MOZ_OVERRIDE \
{ \
nsINode::Remove(); \
return NS_OK; \
} \
NS_IMETHOD GetClientRects(nsIDOMClientRectList** _retval) MOZ_FINAL \
MOZ_OVERRIDE \
{ \
*_retval = Element::GetClientRects().take(); \
return NS_OK; \
} \
NS_IMETHOD GetBoundingClientRect(nsIDOMClientRect** _retval) MOZ_FINAL \
MOZ_OVERRIDE \
{ \
*_retval = Element::GetBoundingClientRect().take(); \
return NS_OK; \
} \
NS_IMETHOD GetScrollTop(int32_t* aScrollTop) MOZ_FINAL \
NS_IMETHOD GetScrollTop(int32_t* aScrollTop) MOZ_FINAL MOZ_OVERRIDE \
{ \
*aScrollTop = Element::ScrollTop(); \
return NS_OK; \
} \
NS_IMETHOD SetScrollTop(int32_t aScrollTop) MOZ_FINAL \
NS_IMETHOD SetScrollTop(int32_t aScrollTop) MOZ_FINAL MOZ_OVERRIDE \
{ \
Element::SetScrollTop(aScrollTop); \
return NS_OK; \
} \
NS_IMETHOD GetScrollLeft(int32_t* aScrollLeft) MOZ_FINAL \
NS_IMETHOD GetScrollLeft(int32_t* aScrollLeft) MOZ_FINAL MOZ_OVERRIDE \
{ \
*aScrollLeft = Element::ScrollLeft(); \
return NS_OK; \
} \
NS_IMETHOD SetScrollLeft(int32_t aScrollLeft) MOZ_FINAL \
NS_IMETHOD SetScrollLeft(int32_t aScrollLeft) MOZ_FINAL MOZ_OVERRIDE \
{ \
Element::SetScrollLeft(aScrollLeft); \
return NS_OK; \
} \
NS_IMETHOD GetScrollWidth(int32_t* aScrollWidth) MOZ_FINAL \
NS_IMETHOD GetScrollWidth(int32_t* aScrollWidth) MOZ_FINAL MOZ_OVERRIDE \
{ \
*aScrollWidth = Element::ScrollWidth(); \
return NS_OK; \
} \
NS_IMETHOD GetScrollHeight(int32_t* aScrollHeight) MOZ_FINAL \
NS_IMETHOD GetScrollHeight(int32_t* aScrollHeight) MOZ_FINAL MOZ_OVERRIDE \
{ \
*aScrollHeight = Element::ScrollHeight(); \
return NS_OK; \
} \
NS_IMETHOD GetClientTop(int32_t* aClientTop) MOZ_FINAL \
NS_IMETHOD GetClientTop(int32_t* aClientTop) MOZ_FINAL MOZ_OVERRIDE \
{ \
*aClientTop = Element::ClientTop(); \
return NS_OK; \
} \
NS_IMETHOD GetClientLeft(int32_t* aClientLeft) MOZ_FINAL \
NS_IMETHOD GetClientLeft(int32_t* aClientLeft) MOZ_FINAL MOZ_OVERRIDE \
{ \
*aClientLeft = Element::ClientLeft(); \
return NS_OK; \
} \
NS_IMETHOD GetClientWidth(int32_t* aClientWidth) MOZ_FINAL \
NS_IMETHOD GetClientWidth(int32_t* aClientWidth) MOZ_FINAL MOZ_OVERRIDE \
{ \
*aClientWidth = Element::ClientWidth(); \
return NS_OK; \
} \
NS_IMETHOD GetClientHeight(int32_t* aClientHeight) MOZ_FINAL \
NS_IMETHOD GetClientHeight(int32_t* aClientHeight) MOZ_FINAL MOZ_OVERRIDE \
{ \
*aClientHeight = Element::ClientHeight(); \
return NS_OK; \
} \
NS_IMETHOD GetScrollLeftMax(int32_t* aScrollLeftMax) MOZ_FINAL \
NS_IMETHOD GetScrollLeftMax(int32_t* aScrollLeftMax) MOZ_FINAL MOZ_OVERRIDE \
{ \
*aScrollLeftMax = Element::ScrollLeftMax(); \
return NS_OK; \
} \
NS_IMETHOD GetScrollTopMax(int32_t* aScrollTopMax) MOZ_FINAL \
NS_IMETHOD GetScrollTopMax(int32_t* aScrollTopMax) MOZ_FINAL MOZ_OVERRIDE \
{ \
*aScrollTopMax = Element::ScrollTopMax(); \
return NS_OK; \
} \
NS_IMETHOD MozMatchesSelector(const nsAString& selector, \
bool* _retval) MOZ_FINAL \
bool* _retval) MOZ_FINAL MOZ_OVERRIDE \
{ \
mozilla::ErrorResult rv; \
*_retval = Element::MozMatchesSelector(selector, rv); \
return rv.ErrorCode(); \
} \
NS_IMETHOD SetCapture(bool retargetToElement) MOZ_FINAL \
NS_IMETHOD SetCapture(bool retargetToElement) MOZ_FINAL MOZ_OVERRIDE \
{ \
Element::SetCapture(retargetToElement); \
return NS_OK; \
} \
NS_IMETHOD ReleaseCapture(void) MOZ_FINAL \
NS_IMETHOD ReleaseCapture(void) MOZ_FINAL MOZ_OVERRIDE \
{ \
Element::ReleaseCapture(); \
return NS_OK; \
} \
NS_IMETHOD MozRequestFullScreen(void) MOZ_FINAL \
NS_IMETHOD MozRequestFullScreen(void) MOZ_FINAL MOZ_OVERRIDE \
{ \
Element::MozRequestFullScreen(mozilla::dom::RequestFullscreenOptions()); \
return NS_OK; \
} \
NS_IMETHOD MozRequestPointerLock(void) MOZ_FINAL \
NS_IMETHOD MozRequestPointerLock(void) MOZ_FINAL MOZ_OVERRIDE \
{ \
Element::MozRequestPointerLock(); \
return NS_OK; \
} \
using nsINode::QuerySelector; \
NS_IMETHOD QuerySelector(const nsAString& aSelector, \
nsIDOMElement **aReturn) MOZ_FINAL \
nsIDOMElement **aReturn) MOZ_FINAL MOZ_OVERRIDE \
{ \
return nsINode::QuerySelector(aSelector, aReturn); \
} \
using nsINode::QuerySelectorAll; \
NS_IMETHOD QuerySelectorAll(const nsAString& aSelector, \
nsIDOMNodeList **aReturn) MOZ_FINAL \
nsIDOMNodeList **aReturn) MOZ_FINAL MOZ_OVERRIDE \
{ \
return nsINode::QuerySelectorAll(aSelector, aReturn); \
}

2
dom/base/EventSource.cpp
View File

@ -500,7 +500,7 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS(AsyncVerifyRedirectCallbackFwr)
// nsIAsyncVerifyRedirectCallback implementation
NS_IMETHOD OnRedirectVerifyCallback(nsresult aResult)
NS_IMETHOD OnRedirectVerifyCallback(nsresult aResult) MOZ_OVERRIDE
{
nsresult rv = mEventSource->OnRedirectVerifyCallback(aResult);
if (NS_FAILED(rv)) {

2
dom/base/File.cpp
View File

@ -1083,7 +1083,7 @@ public:
NS_DECL_THREADSAFE_ISUPPORTS
NS_IMETHOD CollectReports(nsIMemoryReporterCallback *aCallback,
nsISupports *aClosure, bool aAnonymize)
nsISupports *aClosure, bool aAnonymize) MOZ_OVERRIDE
{
typedef FileImplMemory::DataOwner DataOwner;

8
dom/base/File.h
View File

@ -439,7 +439,7 @@ public:
return mIsFile && mLastModificationDate == UINT64_MAX;
}
virtual bool IsFile() const
virtual bool IsFile() const MOZ_OVERRIDE
{
return mIsFile;
}
@ -460,13 +460,13 @@ public:
return false;
}
virtual bool IsSizeUnknown() const
virtual bool IsSizeUnknown() const MOZ_OVERRIDE
{
return mLength == UINT64_MAX;
}
virtual void Unlink() {}
virtual void Traverse(nsCycleCollectionTraversalCallback &aCb) {}
virtual void Unlink() MOZ_OVERRIDE {}
virtual void Traverse(nsCycleCollectionTraversalCallback &aCb) MOZ_OVERRIDE {}
protected:
virtual ~FileImplBase() {}

2
dom/base/FragmentOrElement.h
View File

@ -99,7 +99,7 @@ public:
// nsIWeakReference
NS_DECL_NSIWEAKREFERENCE
virtual size_t SizeOfOnlyThis(mozilla::MallocSizeOf aMallocSizeOf) const;
virtual size_t SizeOfOnlyThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
void NoticeNodeDestruction()
{

4
dom/base/ImageEncoder.cpp
View File

@ -82,7 +82,7 @@ public:
, mFailed(false)
{}
NS_IMETHOD Run()
NS_IMETHOD Run() MOZ_OVERRIDE
{
nsresult rv = NS_OK;
MOZ_ASSERT(NS_IsMainThread());
@ -190,7 +190,7 @@ public:
return rv;
}
NS_IMETHOD Run()
NS_IMETHOD Run() MOZ_OVERRIDE
{
uint64_t imgSize;
void* imgData = nullptr;

4
dom/base/PerformanceResourceTiming.h
View File

@ -33,9 +33,9 @@ public:
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual DOMHighResTimeStamp StartTime() const;
virtual DOMHighResTimeStamp StartTime() const MOZ_OVERRIDE;
virtual DOMHighResTimeStamp Duration() const
virtual DOMHighResTimeStamp Duration() const MOZ_OVERRIDE
{
return ResponseEnd() - StartTime();
}

2
dom/base/WebSocket.cpp
View File

@ -1981,7 +1981,7 @@ public:
return true;
}
bool Suspend(JSContext* aCx)
bool Suspend(JSContext* aCx) MOZ_OVERRIDE
{
mWebSocketImpl->mWorkerShuttingDown = true;
mWebSocketImpl->CloseConnection(nsIWebSocketChannel::CLOSE_GOING_AWAY);

32
dom/base/nsContentIterator.cpp
View File

@ -86,23 +86,23 @@ public:
// nsIContentIterator interface methods ------------------------------
virtual nsresult Init(nsINode* aRoot);
virtual nsresult Init(nsINode* aRoot) MOZ_OVERRIDE;
virtual nsresult Init(nsIDOMRange* aRange);
virtual nsresult Init(nsIDOMRange* aRange) MOZ_OVERRIDE;
virtual void First();
virtual void First() MOZ_OVERRIDE;
virtual void Last();
virtual void Last() MOZ_OVERRIDE;
virtual void Next();
virtual void Next() MOZ_OVERRIDE;
virtual void Prev();
virtual void Prev() MOZ_OVERRIDE;
virtual nsINode* GetCurrentNode();
virtual nsINode* GetCurrentNode() MOZ_OVERRIDE;
virtual bool IsDone();
virtual bool IsDone() MOZ_OVERRIDE;
virtual nsresult PositionAt(nsINode* aCurNode);
virtual nsresult PositionAt(nsINode* aCurNode) MOZ_OVERRIDE;
protected:
virtual ~nsContentIterator();
@ -1113,21 +1113,21 @@ public:
// nsContentIterator overrides ------------------------------
virtual nsresult Init(nsINode* aRoot);
virtual nsresult Init(nsINode* aRoot) MOZ_OVERRIDE;
virtual nsresult Init(nsIDOMRange* aRange);
virtual nsresult Init(nsIDOMRange* aRange) MOZ_OVERRIDE;
virtual void Next();
virtual void Next() MOZ_OVERRIDE;
virtual void Prev();
virtual void Prev() MOZ_OVERRIDE;
virtual nsresult PositionAt(nsINode* aCurNode);
virtual nsresult PositionAt(nsINode* aCurNode) MOZ_OVERRIDE;
// Must override these because we don't do PositionAt
virtual void First();
virtual void First() MOZ_OVERRIDE;
// Must override these because we don't do PositionAt
virtual void Last();
virtual void Last() MOZ_OVERRIDE;
protected:
virtual ~nsContentSubtreeIterator() {}

4
dom/base/nsContentUtils.cpp
View File

@ -339,7 +339,7 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize)
nsISupports* aData, bool aAnonymize) MOZ_OVERRIDE
{
// We don't measure the |EventListenerManager| objects pointed to by the
// entries because those references are non-owning.
@ -411,7 +411,7 @@ class CharsetDetectionObserver MOZ_FINAL : public nsICharsetDetectionObserver
public:
NS_DECL_ISUPPORTS
NS_IMETHOD Notify(const char *aCharset, nsDetectionConfident aConf)
NS_IMETHOD Notify(const char *aCharset, nsDetectionConfident aConf) MOZ_OVERRIDE
{
mCharset = aCharset;
return NS_OK;

2
dom/base/nsDOMClassInfo.h
View File

@ -285,7 +285,7 @@ public:
NS_IMETHOD HasInstance(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, JS::Handle<JS::Value> val, bool *bp,
bool *_retval);
bool *_retval) MOZ_OVERRIDE;
static nsIClassInfo *doCreate(nsDOMClassInfoData* aData)
{

4
dom/base/nsDocument.cpp
View File

@ -9697,7 +9697,7 @@ class StubCSSLoaderObserver MOZ_FINAL : public nsICSSLoaderObserver {
~StubCSSLoaderObserver() {}
public:
NS_IMETHOD
StyleSheetLoaded(CSSStyleSheet*, bool, nsresult)
StyleSheetLoaded(CSSStyleSheet*, bool, nsresult) MOZ_OVERRIDE
{
return NS_OK;
}
@ -11837,7 +11837,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSICONTENTPERMISSIONREQUEST
NS_IMETHOD Run()
NS_IMETHOD Run() MOZ_OVERRIDE
{
nsCOMPtr<Element> e = do_QueryReferent(mElement);
nsCOMPtr<nsIDocument> d = do_QueryReferent(mDocument);

68
dom/base/nsDocument.h
View File

@ -991,23 +991,23 @@ public:
int32_t aNamespaceID,
nsIContent **aResult) MOZ_OVERRIDE;
virtual void Sanitize();
virtual void Sanitize() MOZ_OVERRIDE;
virtual void EnumerateSubDocuments(nsSubDocEnumFunc aCallback,
void *aData);
void *aData) MOZ_OVERRIDE;
virtual bool CanSavePresentation(nsIRequest *aNewRequest);
virtual void Destroy();
virtual void RemovedFromDocShell();
virtual already_AddRefed<nsILayoutHistoryState> GetLayoutHistoryState() const;
virtual bool CanSavePresentation(nsIRequest *aNewRequest) MOZ_OVERRIDE;
virtual void Destroy() MOZ_OVERRIDE;
virtual void RemovedFromDocShell() MOZ_OVERRIDE;
virtual already_AddRefed<nsILayoutHistoryState> GetLayoutHistoryState() const MOZ_OVERRIDE;
virtual void BlockOnload();
virtual void UnblockOnload(bool aFireSync);
virtual void BlockOnload() MOZ_OVERRIDE;
virtual void UnblockOnload(bool aFireSync) MOZ_OVERRIDE;
virtual void AddStyleRelevantLink(mozilla::dom::Link* aLink);
virtual void ForgetLink(mozilla::dom::Link* aLink);
virtual void AddStyleRelevantLink(mozilla::dom::Link* aLink) MOZ_OVERRIDE;
virtual void ForgetLink(mozilla::dom::Link* aLink) MOZ_OVERRIDE;
void ClearBoxObjectFor(nsIContent* aContent);
virtual void ClearBoxObjectFor(nsIContent* aContent) MOZ_OVERRIDE;
virtual already_AddRefed<mozilla::dom::BoxObject>
GetBoxObjectFor(mozilla::dom::Element* aElement,
@ -1016,31 +1016,31 @@ public:
virtual Element*
GetAnonymousElementByAttribute(nsIContent* aElement,
nsIAtom* aAttrName,
const nsAString& aAttrValue) const;
const nsAString& aAttrValue) const MOZ_OVERRIDE;
virtual Element* ElementFromPointHelper(float aX, float aY,
bool aIgnoreRootScrollFrame,
bool aFlushLayout);
bool aFlushLayout) MOZ_OVERRIDE;
virtual nsresult NodesFromRectHelper(float aX, float aY,
float aTopSize, float aRightSize,
float aBottomSize, float aLeftSize,
bool aIgnoreRootScrollFrame,
bool aFlushLayout,
nsIDOMNodeList** aReturn);
nsIDOMNodeList** aReturn) MOZ_OVERRIDE;
virtual void FlushSkinBindings();
virtual void FlushSkinBindings() MOZ_OVERRIDE;
virtual nsresult InitializeFrameLoader(nsFrameLoader* aLoader);
virtual nsresult FinalizeFrameLoader(nsFrameLoader* aLoader);
virtual void TryCancelFrameLoaderInitialization(nsIDocShell* aShell);
virtual bool FrameLoaderScheduledToBeFinalized(nsIDocShell* aShell);
virtual nsresult InitializeFrameLoader(nsFrameLoader* aLoader) MOZ_OVERRIDE;
virtual nsresult FinalizeFrameLoader(nsFrameLoader* aLoader) MOZ_OVERRIDE;
virtual void TryCancelFrameLoaderInitialization(nsIDocShell* aShell) MOZ_OVERRIDE;
virtual bool FrameLoaderScheduledToBeFinalized(nsIDocShell* aShell) MOZ_OVERRIDE;
virtual nsIDocument*
RequestExternalResource(nsIURI* aURI,
nsINode* aRequestingNode,
ExternalResourceLoad** aPendingLoad);
ExternalResourceLoad** aPendingLoad) MOZ_OVERRIDE;
virtual void
EnumerateExternalResources(nsSubDocEnumFunc aCallback, void* aData);
EnumerateExternalResources(nsSubDocEnumFunc aCallback, void* aData) MOZ_OVERRIDE;
nsTArray<nsCString> mHostObjectURIs;
@ -1049,7 +1049,7 @@ public:
nsSMILAnimationController* GetAnimationController() MOZ_OVERRIDE;
virtual mozilla::PendingPlayerTracker*
GetPendingPlayerTracker() MOZ_FINAL
GetPendingPlayerTracker() MOZ_FINAL MOZ_OVERRIDE
{
return mPendingPlayerTracker;
}
@ -1135,9 +1135,9 @@ public:
virtual void MozSetImageElement(const nsAString& aImageElementId,
Element* aElement) MOZ_OVERRIDE;
virtual nsresult AddImage(imgIRequest* aImage);
virtual nsresult RemoveImage(imgIRequest* aImage, uint32_t aFlags);
virtual nsresult SetImageLockingState(bool aLocked);
virtual nsresult AddImage(imgIRequest* aImage) MOZ_OVERRIDE;
virtual nsresult RemoveImage(imgIRequest* aImage, uint32_t aFlags) MOZ_OVERRIDE;
virtual nsresult SetImageLockingState(bool aLocked) MOZ_OVERRIDE;
// AddPlugin adds a plugin-related element to mPlugins when the element is
// added to the tree.
@ -1312,25 +1312,25 @@ public:
mozilla::ErrorResult& rv) MOZ_OVERRIDE;
virtual void UseRegistryFromDocument(nsIDocument* aDocument) MOZ_OVERRIDE;
virtual nsIDocument* MasterDocument()
virtual nsIDocument* MasterDocument() MOZ_OVERRIDE
{
return mMasterDocument ? mMasterDocument.get()
: this;
}
virtual void SetMasterDocument(nsIDocument* master)
virtual void SetMasterDocument(nsIDocument* master) MOZ_OVERRIDE
{
MOZ_ASSERT(master);
mMasterDocument = master;
UseRegistryFromDocument(mMasterDocument);
}
virtual bool IsMasterDocument()
virtual bool IsMasterDocument() MOZ_OVERRIDE
{
return !mMasterDocument;
}
virtual mozilla::dom::ImportManager* ImportManager()
virtual mozilla::dom::ImportManager* ImportManager() MOZ_OVERRIDE
{
if (mImportManager) {
MOZ_ASSERT(!mMasterDocument, "Only the master document has ImportManager set");
@ -1349,22 +1349,22 @@ public:
return mImportManager.get();
}
virtual bool HasSubImportLink(nsINode* aLink)
virtual bool HasSubImportLink(nsINode* aLink) MOZ_OVERRIDE
{
return mSubImportLinks.Contains(aLink);
}
virtual uint32_t IndexOfSubImportLink(nsINode* aLink)
virtual uint32_t IndexOfSubImportLink(nsINode* aLink) MOZ_OVERRIDE
{
return mSubImportLinks.IndexOf(aLink);
}
virtual void AddSubImportLink(nsINode* aLink)
virtual void AddSubImportLink(nsINode* aLink) MOZ_OVERRIDE
{
mSubImportLinks.AppendElement(aLink);
}
virtual nsINode* GetSubImportLink(uint32_t aIdx)
virtual nsINode* GetSubImportLink(uint32_t aIdx) MOZ_OVERRIDE
{
return aIdx < mSubImportLinks.Length() ? mSubImportLinks[aIdx].get()
: nullptr;
@ -1562,7 +1562,7 @@ public:
// ex. <x-button>, <button is="x-button> (type extension)
virtual void SetupCustomElement(Element* aElement,
uint32_t aNamespaceID,
const nsAString* aTypeExtension);
const nsAString* aTypeExtension) MOZ_OVERRIDE;
static bool IsWebComponentsEnabled(JSContext* aCx, JSObject* aObject);

2
dom/base/nsFrameMessageManager.cpp
View File

@ -1855,7 +1855,7 @@ public:
const nsAString& aMessage,
const mozilla::dom::StructuredCloneData& aData,
JS::Handle<JSObject *> aCpows,
nsIPrincipal* aPrincipal)
nsIPrincipal* aPrincipal) MOZ_OVERRIDE
{
if (!nsFrameMessageManager::sPendingSameProcessAsyncMessages) {
nsFrameMessageManager::sPendingSameProcessAsyncMessages = new nsTArray<nsCOMPtr<nsIRunnable> >;

2
dom/base/nsFrameMessageManager.h
View File

@ -427,7 +427,7 @@ class nsScriptCacheCleaner MOZ_FINAL : public nsIObserver
NS_IMETHODIMP Observe(nsISupports *aSubject,
const char *aTopic,
const char16_t *aData)
const char16_t *aData) MOZ_OVERRIDE
{
nsFrameScriptExecutor::Shutdown();
return NS_OK;

8
dom/base/nsGenConImageContent.cpp
View File

@ -41,11 +41,11 @@ public:
// nsIContent overrides
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers);
virtual void UnbindFromTree(bool aDeep, bool aNullParent);
virtual EventStates IntrinsicState() const;
bool aCompileEventHandlers) MOZ_OVERRIDE;
virtual void UnbindFromTree(bool aDeep, bool aNullParent) MOZ_OVERRIDE;
virtual EventStates IntrinsicState() const MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(EventChainPreVisitor& aVisitor)
virtual nsresult PreHandleEvent(EventChainPreVisitor& aVisitor) MOZ_OVERRIDE
{
MOZ_ASSERT(IsInNativeAnonymousSubtree());
if (aVisitor.mEvent->message == NS_LOAD ||

2
dom/base/nsGenericDOMDataNode.h
View File

@ -228,7 +228,7 @@ public:
protected:
virtual ~nsGenericDOMDataNode();
virtual mozilla::dom::Element* GetNameSpaceElement()
virtual mozilla::dom::Element* GetNameSpaceElement() MOZ_OVERRIDE
{
nsINode *parent = GetParentNode();

4
dom/base/nsGlobalWindow.cpp
View File

@ -480,14 +480,14 @@ class nsGlobalWindowObserver MOZ_FINAL : public nsIObserver,
public:
explicit nsGlobalWindowObserver(nsGlobalWindow* aWindow) : mWindow(aWindow) {}
NS_DECL_ISUPPORTS
NS_IMETHOD Observe(nsISupports* aSubject, const char* aTopic, const char16_t* aData)
NS_IMETHOD Observe(nsISupports* aSubject, const char* aTopic, const char16_t* aData) MOZ_OVERRIDE
{
if (!mWindow)
return NS_OK;
return mWindow->Observe(aSubject, aTopic, aData);
}
void Forget() { mWindow = nullptr; }
NS_IMETHODIMP GetInterface(const nsIID& aIID, void** aResult)
NS_IMETHODIMP GetInterface(const nsIID& aIID, void** aResult) MOZ_OVERRIDE
{
if (mWindow && aIID.Equals(NS_GET_IID(nsIDOMWindow)) && mWindow) {
return mWindow->QueryInterface(aIID, aResult);

130
dom/base/nsGlobalWindow.h
View File

@ -358,7 +358,7 @@ public:
}
// nsIGlobalJSObjectHolder
virtual JSObject *GetGlobalJSObject();
virtual JSObject* GetGlobalJSObject() MOZ_OVERRIDE;
// nsIScriptGlobalObject
JSObject *FastGetGlobalJSObject() const
@ -368,18 +368,18 @@ public:
void TraceGlobalJSObject(JSTracer* aTrc);
virtual nsresult EnsureScriptEnvironment();
virtual nsresult EnsureScriptEnvironment() MOZ_OVERRIDE;
virtual nsIScriptContext *GetScriptContext();
virtual nsIScriptContext *GetScriptContext() MOZ_OVERRIDE;
void PoisonOuterWindowProxy(JSObject *aObject);
virtual bool IsBlackForCC(bool aTracingNeeded = true);
virtual bool IsBlackForCC(bool aTracingNeeded = true) MOZ_OVERRIDE;
static JSObject* OuterObject(JSContext* aCx, JS::Handle<JSObject*> aObj);
// nsIScriptObjectPrincipal
virtual nsIPrincipal* GetPrincipal();
virtual nsIPrincipal* GetPrincipal() MOZ_OVERRIDE;
// nsIDOMWindow
NS_DECL_NSIDOMWINDOW
@ -412,76 +412,76 @@ public:
}
// nsPIDOMWindow
virtual nsPIDOMWindow* GetPrivateRoot();
virtual nsPIDOMWindow* GetPrivateRoot() MOZ_OVERRIDE;
// Outer windows only.
virtual void ActivateOrDeactivate(bool aActivate);
virtual void SetActive(bool aActive);
virtual void SetIsBackground(bool aIsBackground);
virtual void SetChromeEventHandler(mozilla::dom::EventTarget* aChromeEventHandler);
virtual void ActivateOrDeactivate(bool aActivate) MOZ_OVERRIDE;
virtual void SetActive(bool aActive) MOZ_OVERRIDE;
virtual void SetIsBackground(bool aIsBackground) MOZ_OVERRIDE;
virtual void SetChromeEventHandler(mozilla::dom::EventTarget* aChromeEventHandler) MOZ_OVERRIDE;
// Outer windows only.
virtual void SetInitialPrincipalToSubject();
virtual void SetInitialPrincipalToSubject() MOZ_OVERRIDE;
virtual PopupControlState PushPopupControlState(PopupControlState state, bool aForce) const;
virtual void PopPopupControlState(PopupControlState state) const;
virtual PopupControlState GetPopupControlState() const;
virtual PopupControlState PushPopupControlState(PopupControlState state, bool aForce) const MOZ_OVERRIDE;
virtual void PopPopupControlState(PopupControlState state) const MOZ_OVERRIDE;
virtual PopupControlState GetPopupControlState() const MOZ_OVERRIDE;
virtual already_AddRefed<nsISupports> SaveWindowState();
virtual nsresult RestoreWindowState(nsISupports *aState);
virtual already_AddRefed<nsISupports> SaveWindowState() MOZ_OVERRIDE;
virtual nsresult RestoreWindowState(nsISupports *aState) MOZ_OVERRIDE;
virtual void SuspendTimeouts(uint32_t aIncrease = 1,
bool aFreezeChildren = true);
virtual nsresult ResumeTimeouts(bool aThawChildren = true);
virtual uint32_t TimeoutSuspendCount();
virtual nsresult FireDelayedDOMEvents();
virtual bool IsFrozen() const
bool aFreezeChildren = true) MOZ_OVERRIDE;
virtual nsresult ResumeTimeouts(bool aThawChildren = true) MOZ_OVERRIDE;
virtual uint32_t TimeoutSuspendCount() MOZ_OVERRIDE;
virtual nsresult FireDelayedDOMEvents() MOZ_OVERRIDE;
virtual bool IsFrozen() const MOZ_OVERRIDE
{
return mIsFrozen;
}
virtual bool IsRunningTimeout() { return mTimeoutFiringDepth > 0; }
virtual bool IsRunningTimeout() MOZ_OVERRIDE { return mTimeoutFiringDepth > 0; }
// Outer windows only.
virtual bool WouldReuseInnerWindow(nsIDocument* aNewDocument);
virtual bool WouldReuseInnerWindow(nsIDocument* aNewDocument) MOZ_OVERRIDE;
virtual void SetDocShell(nsIDocShell* aDocShell);
virtual void DetachFromDocShell();
virtual void SetDocShell(nsIDocShell* aDocShell) MOZ_OVERRIDE;
virtual void DetachFromDocShell() MOZ_OVERRIDE;
virtual nsresult SetNewDocument(nsIDocument *aDocument,
nsISupports *aState,
bool aForceReuseInnerWindow);
nsISupports *aState,
bool aForceReuseInnerWindow) MOZ_OVERRIDE;
// Outer windows only.
void DispatchDOMWindowCreated();
virtual void SetOpenerWindow(nsIDOMWindow* aOpener,
bool aOriginalOpener);
bool aOriginalOpener) MOZ_OVERRIDE;
// Outer windows only.
virtual void EnsureSizeUpToDate();
virtual void EnsureSizeUpToDate() MOZ_OVERRIDE;
virtual void EnterModalState();
virtual void LeaveModalState();
virtual void EnterModalState() MOZ_OVERRIDE;
virtual void LeaveModalState() MOZ_OVERRIDE;
// Outer windows only.
virtual bool CanClose();
virtual void ForceClose();
virtual bool CanClose() MOZ_OVERRIDE;
virtual void ForceClose() MOZ_OVERRIDE;
virtual void MaybeUpdateTouchState();
virtual void UpdateTouchState();
virtual void MaybeUpdateTouchState() MOZ_OVERRIDE;
virtual void UpdateTouchState() MOZ_OVERRIDE;
// Outer windows only.
virtual bool DispatchCustomEvent(const nsAString& aEventName);
virtual bool DispatchCustomEvent(const nsAString& aEventName) MOZ_OVERRIDE;
bool DispatchResizeEvent(const mozilla::CSSIntSize& aSize);
// Inner windows only.
virtual void RefreshCompartmentPrincipal();
virtual void RefreshCompartmentPrincipal() MOZ_OVERRIDE;
// Outer windows only.
virtual nsresult SetFullScreenInternal(bool aIsFullScreen, bool aRequireTrust,
mozilla::gfx::VRHMDInfo *aHMD = nullptr);
mozilla::gfx::VRHMDInfo *aHMD = nullptr) MOZ_OVERRIDE;
bool FullScreen() const;
// Inner windows only.
virtual void SetHasGamepadEventListener(bool aHasGamepad = true);
virtual void SetHasGamepadEventListener(bool aHasGamepad = true) MOZ_OVERRIDE;
// nsIInterfaceRequestor
NS_DECL_NSIINTERFACEREQUESTOR
@ -632,32 +632,32 @@ public:
#endif
virtual JSObject*
GetCachedXBLPrototypeHandler(nsXBLPrototypeHandler* aKey);
GetCachedXBLPrototypeHandler(nsXBLPrototypeHandler* aKey) MOZ_OVERRIDE;
virtual void
CacheXBLPrototypeHandler(nsXBLPrototypeHandler* aKey,
JS::Handle<JSObject*> aHandler);
JS::Handle<JSObject*> aHandler) MOZ_OVERRIDE;
virtual bool TakeFocus(bool aFocus, uint32_t aFocusMethod);
virtual void SetReadyForFocus();
virtual void PageHidden();
virtual nsresult DispatchAsyncHashchange(nsIURI *aOldURI, nsIURI *aNewURI);
virtual nsresult DispatchSyncPopState();
virtual bool TakeFocus(bool aFocus, uint32_t aFocusMethod) MOZ_OVERRIDE;
virtual void SetReadyForFocus() MOZ_OVERRIDE;
virtual void PageHidden() MOZ_OVERRIDE;
virtual nsresult DispatchAsyncHashchange(nsIURI *aOldURI, nsIURI *aNewURI) MOZ_OVERRIDE;
virtual nsresult DispatchSyncPopState() MOZ_OVERRIDE;
// Inner windows only.
virtual void EnableDeviceSensor(uint32_t aType);
virtual void DisableDeviceSensor(uint32_t aType);
virtual void EnableDeviceSensor(uint32_t aType) MOZ_OVERRIDE;
virtual void DisableDeviceSensor(uint32_t aType) MOZ_OVERRIDE;
virtual void EnableTimeChangeNotifications();
virtual void DisableTimeChangeNotifications();
virtual void EnableTimeChangeNotifications() MOZ_OVERRIDE;
virtual void DisableTimeChangeNotifications() MOZ_OVERRIDE;
#ifdef MOZ_B2G
// Inner windows only.
virtual void EnableNetworkEvent(uint32_t aType);
virtual void DisableNetworkEvent(uint32_t aType);
virtual void EnableNetworkEvent(uint32_t aType) MOZ_OVERRIDE;
virtual void DisableNetworkEvent(uint32_t aType) MOZ_OVERRIDE;
#endif // MOZ_B2G
virtual nsresult SetArguments(nsIArray *aArguments);
virtual nsresult SetArguments(nsIArray* aArguments) MOZ_OVERRIDE;
void MaybeForgiveSpamCount();
bool IsClosedOrClosing() {
@ -673,7 +673,7 @@ public:
const nsAString& aPopupWindowName,
const nsAString& aPopupWindowFeatures) MOZ_OVERRIDE;
virtual uint32_t GetSerial() {
virtual uint32_t GetSerial() MOZ_OVERRIDE {
return mSerial;
}
@ -1153,7 +1153,7 @@ protected:
OpenNoNavigate(const nsAString& aUrl,
const nsAString& aName,
const nsAString& aOptions,
nsIDOMWindow **_retval);
nsIDOMWindow** _retval) MOZ_OVERRIDE;
private:
/**
@ -1222,7 +1222,7 @@ public:
// |interval| is in milliseconds.
nsresult SetTimeoutOrInterval(nsIScriptTimeoutHandler *aHandler,
int32_t interval,
bool aIsInterval, int32_t *aReturn);
bool aIsInterval, int32_t* aReturn) MOZ_OVERRIDE;
int32_t SetTimeoutOrInterval(mozilla::dom::Function& aFunction,
int32_t aTimeout,
const mozilla::dom::Sequence<JS::Value>& aArguments,
@ -1232,7 +1232,7 @@ public:
mozilla::ErrorResult& aError);
void ClearTimeoutOrInterval(int32_t aTimerID,
mozilla::ErrorResult& aError);
nsresult ClearTimeoutOrInterval(int32_t aTimerID)
nsresult ClearTimeoutOrInterval(int32_t aTimerID) MOZ_OVERRIDE
{
mozilla::ErrorResult rv;
ClearTimeoutOrInterval(aTimerID, rv);
@ -1277,10 +1277,10 @@ public:
uint32_t GetFuzzTimeMS();
nsresult ScheduleActiveTimerCallback();
uint32_t FindInsertionIndex(IdleObserverHolder* aIdleObserver);
virtual nsresult RegisterIdleObserver(nsIIdleObserver* aIdleObserverPtr);
virtual nsresult RegisterIdleObserver(nsIIdleObserver* aIdleObserverPtr) MOZ_OVERRIDE;
nsresult FindIndexOfElementToRemove(nsIIdleObserver* aIdleObserver,
int32_t* aRemoveElementIndex);
virtual nsresult UnregisterIdleObserver(nsIIdleObserver* aIdleObserverPtr);
virtual nsresult UnregisterIdleObserver(nsIIdleObserver* aIdleObserverPtr) MOZ_OVERRIDE;
// Inner windows only.
nsresult FireHashchange(const nsAString &aOldURL, const nsAString &aNewURL);
@ -1362,16 +1362,16 @@ public:
virtual void SetFocusedNode(nsIContent* aNode,
uint32_t aFocusMethod = 0,
bool aNeedsFocus = false);
bool aNeedsFocus = false) MOZ_OVERRIDE;
virtual uint32_t GetFocusMethod();
virtual uint32_t GetFocusMethod() MOZ_OVERRIDE;
virtual bool ShouldShowFocusRing();
virtual bool ShouldShowFocusRing() MOZ_OVERRIDE;
virtual void SetKeyboardIndicators(UIStateChangeType aShowAccelerators,
UIStateChangeType aShowFocusRings);
UIStateChangeType aShowFocusRings) MOZ_OVERRIDE;
virtual void GetKeyboardIndicators(bool* aShowAccelerators,
bool* aShowFocusRings);
bool* aShowFocusRings) MOZ_OVERRIDE;
// Inner windows only.
void UpdateCanvasFocus(bool aFocusChanged, nsIContent* aNewContent);
@ -1388,7 +1388,7 @@ protected:
void ClearStatus();
virtual void UpdateParentTarget();
virtual void UpdateParentTarget() MOZ_OVERRIDE;
inline int32_t DOMMinTimeoutValue() const;

6
dom/base/nsGlobalWindowCommands.cpp
View File

@ -112,9 +112,9 @@ class nsSelectionCommandsBase : public nsIControllerCommand
{
public:
NS_DECL_ISUPPORTS
NS_IMETHOD IsCommandEnabled(const char * aCommandName, nsISupports *aCommandContext, bool *_retval);
NS_IMETHOD GetCommandStateParams(const char * aCommandName, nsICommandParams *aParams, nsISupports *aCommandContext);
NS_IMETHOD DoCommandParams(const char * aCommandName, nsICommandParams *aParams, nsISupports *aCommandContext);
NS_IMETHOD IsCommandEnabled(const char* aCommandName, nsISupports* aCommandContext, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD GetCommandStateParams(const char* aCommandName, nsICommandParams* aParams, nsISupports* aCommandContext) MOZ_OVERRIDE;
NS_IMETHOD DoCommandParams(const char* aCommandName, nsICommandParams* aParams, nsISupports* aCommandContext) MOZ_OVERRIDE;
protected:
virtual ~nsSelectionCommandsBase() {}

4
dom/base/nsHostObjectProtocolHandler.cpp
View File

@ -44,7 +44,7 @@ class HostObjectURLsReporter MOZ_FINAL : public nsIMemoryReporter
NS_DECL_ISUPPORTS
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize)
nsISupports* aData, bool aAnonymize) MOZ_OVERRIDE
{
return MOZ_COLLECT_REPORT(
"host-object-urls", KIND_OTHER, UNITS_COUNT,
@ -62,7 +62,7 @@ class BlobURLsReporter MOZ_FINAL : public nsIMemoryReporter
NS_DECL_ISUPPORTS
NS_IMETHOD CollectReports(nsIHandleReportCallback* aCallback,
nsISupports* aData, bool aAnonymize)
nsISupports* aData, bool aAnonymize) MOZ_OVERRIDE
{
EnumArg env;
env.mCallback = aCallback;

2
dom/base/nsIDocument.h
View File

@ -2508,7 +2508,7 @@ protected:
virtual void MutationEventDispatched(nsINode* aTarget) = 0;
friend class mozAutoSubtreeModified;
virtual Element* GetNameSpaceElement()
virtual Element* GetNameSpaceElement() MOZ_OVERRIDE
{
return GetRootElement();
}

24
dom/base/nsIDocumentObserver.h
View File

@ -195,56 +195,56 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIDocumentObserver, NS_IDOCUMENT_OBSERVER_IID)
#define NS_DECL_NSIDOCUMENTOBSERVER_BEGINUPDATE \
virtual void BeginUpdate(nsIDocument* aDocument, \
nsUpdateType aUpdateType);
nsUpdateType aUpdateType) MOZ_OVERRIDE;
#define NS_DECL_NSIDOCUMENTOBSERVER_ENDUPDATE \
virtual void EndUpdate(nsIDocument* aDocument, nsUpdateType aUpdateType);
virtual void EndUpdate(nsIDocument* aDocument, nsUpdateType aUpdateType) MOZ_OVERRIDE;
#define NS_DECL_NSIDOCUMENTOBSERVER_BEGINLOAD \
virtual void BeginLoad(nsIDocument* aDocument);
virtual void BeginLoad(nsIDocument* aDocument) MOZ_OVERRIDE;
#define NS_DECL_NSIDOCUMENTOBSERVER_ENDLOAD \
virtual void EndLoad(nsIDocument* aDocument);
virtual void EndLoad(nsIDocument* aDocument) MOZ_OVERRIDE;
#define NS_DECL_NSIDOCUMENTOBSERVER_CONTENTSTATECHANGED \
virtual void ContentStateChanged(nsIDocument* aDocument, \
nsIContent* aContent, \
mozilla::EventStates aStateMask);
mozilla::EventStates aStateMask) MOZ_OVERRIDE;
#define NS_DECL_NSIDOCUMENTOBSERVER_DOCUMENTSTATESCHANGED \
virtual void DocumentStatesChanged(nsIDocument* aDocument, \
mozilla::EventStates aStateMask);
mozilla::EventStates aStateMask) MOZ_OVERRIDE;
#define NS_DECL_NSIDOCUMENTOBSERVER_STYLESHEETADDED \
virtual void StyleSheetAdded(nsIDocument* aDocument, \
nsIStyleSheet* aStyleSheet, \
bool aDocumentSheet);
bool aDocumentSheet) MOZ_OVERRIDE;
#define NS_DECL_NSIDOCUMENTOBSERVER_STYLESHEETREMOVED \
virtual void StyleSheetRemoved(nsIDocument* aDocument, \
nsIStyleSheet* aStyleSheet, \
bool aDocumentSheet);
bool aDocumentSheet) MOZ_OVERRIDE;
#define NS_DECL_NSIDOCUMENTOBSERVER_STYLESHEETAPPLICABLESTATECHANGED \
virtual void StyleSheetApplicableStateChanged(nsIDocument* aDocument, \
nsIStyleSheet* aStyleSheet,\
bool aApplicable);
bool aApplicable) MOZ_OVERRIDE;
#define NS_DECL_NSIDOCUMENTOBSERVER_STYLERULECHANGED \
virtual void StyleRuleChanged(nsIDocument* aDocument, \
nsIStyleSheet* aStyleSheet, \
nsIStyleRule* aOldStyleRule, \
nsIStyleRule* aNewStyleRule);
nsIStyleRule* aNewStyleRule) MOZ_OVERRIDE;
#define NS_DECL_NSIDOCUMENTOBSERVER_STYLERULEADDED \
virtual void StyleRuleAdded(nsIDocument* aDocument, \
nsIStyleSheet* aStyleSheet, \
nsIStyleRule* aStyleRule);
nsIStyleRule* aStyleRule) MOZ_OVERRIDE;
#define NS_DECL_NSIDOCUMENTOBSERVER_STYLERULEREMOVED \
virtual void StyleRuleRemoved(nsIDocument* aDocument, \
nsIStyleSheet* aStyleSheet, \
nsIStyleRule* aStyleRule);
nsIStyleRule* aStyleRule) MOZ_OVERRIDE;
#define NS_DECL_NSIDOCUMENTOBSERVER \
NS_DECL_NSIDOCUMENTOBSERVER_BEGINUPDATE \

18
dom/base/nsIMutationObserver.h
View File

@ -323,51 +323,51 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIMutationObserver, NS_IMUTATION_OBSERVER_IID)
#define NS_DECL_NSIMUTATIONOBSERVER_CHARACTERDATAWILLCHANGE \
virtual void CharacterDataWillChange(nsIDocument* aDocument, \
nsIContent* aContent, \
CharacterDataChangeInfo* aInfo);
CharacterDataChangeInfo* aInfo) MOZ_OVERRIDE;
#define NS_DECL_NSIMUTATIONOBSERVER_CHARACTERDATACHANGED \
virtual void CharacterDataChanged(nsIDocument* aDocument, \
nsIContent* aContent, \
CharacterDataChangeInfo* aInfo);
CharacterDataChangeInfo* aInfo) MOZ_OVERRIDE;
#define NS_DECL_NSIMUTATIONOBSERVER_ATTRIBUTEWILLCHANGE \
virtual void AttributeWillChange(nsIDocument* aDocument, \
mozilla::dom::Element* aElement, \
int32_t aNameSpaceID, \
nsIAtom* aAttribute, \
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
#define NS_DECL_NSIMUTATIONOBSERVER_ATTRIBUTECHANGED \
virtual void AttributeChanged(nsIDocument* aDocument, \
mozilla::dom::Element* aElement, \
int32_t aNameSpaceID, \
nsIAtom* aAttribute, \
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
#define NS_DECL_NSIMUTATIONOBSERVER_CONTENTAPPENDED \
virtual void ContentAppended(nsIDocument* aDocument, \
nsIContent* aContainer, \
nsIContent* aFirstNewContent, \
int32_t aNewIndexInContainer);
int32_t aNewIndexInContainer) MOZ_OVERRIDE;
#define NS_DECL_NSIMUTATIONOBSERVER_CONTENTINSERTED \
virtual void ContentInserted(nsIDocument* aDocument, \
nsIContent* aContainer, \
nsIContent* aChild, \
int32_t aIndexInContainer);
int32_t aIndexInContainer) MOZ_OVERRIDE;
#define NS_DECL_NSIMUTATIONOBSERVER_CONTENTREMOVED \
virtual void ContentRemoved(nsIDocument* aDocument, \
nsIContent* aContainer, \
nsIContent* aChild, \
int32_t aIndexInContainer, \
nsIContent* aPreviousSibling);
nsIContent* aPreviousSibling) MOZ_OVERRIDE;
#define NS_DECL_NSIMUTATIONOBSERVER_NODEWILLBEDESTROYED \
virtual void NodeWillBeDestroyed(const nsINode* aNode);
virtual void NodeWillBeDestroyed(const nsINode* aNode) MOZ_OVERRIDE;
#define NS_DECL_NSIMUTATIONOBSERVER_PARENTCHAINCHANGED \
virtual void ParentChainChanged(nsIContent *aContent);
virtual void ParentChainChanged(nsIContent *aContent) MOZ_OVERRIDE;
#define NS_DECL_NSIMUTATIONOBSERVER \
NS_DECL_NSIMUTATIONOBSERVER_CHARACTERDATAWILLCHANGE \

72
dom/base/nsINode.h
View File

@ -239,7 +239,7 @@ private:
// defined, it is inherited from nsINode.
// This macro isn't actually specific to nodes, and bug 956400 will move it into MFBT.
#define NS_DECL_SIZEOF_EXCLUDING_THIS \
virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
// Categories of node properties
// 0 is global.
@ -293,7 +293,7 @@ public:
// The following members don't need to be measured:
// - nsIContent: mPrimaryFrame, because it's non-owning and measured elsewhere
//
NS_DECL_SIZEOF_EXCLUDING_THIS
virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
// SizeOfIncludingThis doesn't need to be overridden by sub-classes because
// sub-classes of nsINode are guaranteed to be laid out in memory in such a
@ -1877,81 +1877,81 @@ ToCanonicalSupports(nsINode* aPointer)
}
#define NS_FORWARD_NSIDOMNODE_TO_NSINODE_HELPER(...) \
NS_IMETHOD GetNodeName(nsAString& aNodeName) __VA_ARGS__ \
NS_IMETHOD GetNodeName(nsAString& aNodeName) __VA_ARGS__ MOZ_OVERRIDE \
{ \
aNodeName = nsINode::NodeName(); \
return NS_OK; \
} \
NS_IMETHOD GetNodeValue(nsAString& aNodeValue) __VA_ARGS__ \
NS_IMETHOD GetNodeValue(nsAString& aNodeValue) __VA_ARGS__ MOZ_OVERRIDE \
{ \
nsINode::GetNodeValue(aNodeValue); \
return NS_OK; \
} \
NS_IMETHOD SetNodeValue(const nsAString& aNodeValue) __VA_ARGS__ \
NS_IMETHOD SetNodeValue(const nsAString& aNodeValue) __VA_ARGS__ MOZ_OVERRIDE \
{ \
mozilla::ErrorResult rv; \
nsINode::SetNodeValue(aNodeValue, rv); \
return rv.ErrorCode(); \
} \
NS_IMETHOD GetNodeType(uint16_t* aNodeType) __VA_ARGS__ \
NS_IMETHOD GetNodeType(uint16_t* aNodeType) __VA_ARGS__ MOZ_OVERRIDE \
{ \
*aNodeType = nsINode::NodeType(); \
return NS_OK; \
} \
NS_IMETHOD GetParentNode(nsIDOMNode** aParentNode) __VA_ARGS__ \
NS_IMETHOD GetParentNode(nsIDOMNode** aParentNode) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return nsINode::GetParentNode(aParentNode); \
} \
NS_IMETHOD GetParentElement(nsIDOMElement** aParentElement) __VA_ARGS__ \
NS_IMETHOD GetParentElement(nsIDOMElement** aParentElement) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return nsINode::GetParentElement(aParentElement); \
} \
NS_IMETHOD GetChildNodes(nsIDOMNodeList** aChildNodes) __VA_ARGS__ \
NS_IMETHOD GetChildNodes(nsIDOMNodeList** aChildNodes) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return nsINode::GetChildNodes(aChildNodes); \
} \
NS_IMETHOD GetFirstChild(nsIDOMNode** aFirstChild) __VA_ARGS__ \
NS_IMETHOD GetFirstChild(nsIDOMNode** aFirstChild) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return nsINode::GetFirstChild(aFirstChild); \
} \
NS_IMETHOD GetLastChild(nsIDOMNode** aLastChild) __VA_ARGS__ \
NS_IMETHOD GetLastChild(nsIDOMNode** aLastChild) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return nsINode::GetLastChild(aLastChild); \
} \
NS_IMETHOD GetPreviousSibling(nsIDOMNode** aPreviousSibling) __VA_ARGS__ \
NS_IMETHOD GetPreviousSibling(nsIDOMNode** aPreviousSibling) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return nsINode::GetPreviousSibling(aPreviousSibling); \
} \
NS_IMETHOD GetNextSibling(nsIDOMNode** aNextSibling) __VA_ARGS__ \
NS_IMETHOD GetNextSibling(nsIDOMNode** aNextSibling) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return nsINode::GetNextSibling(aNextSibling); \
} \
NS_IMETHOD GetOwnerDocument(nsIDOMDocument** aOwnerDocument) __VA_ARGS__ \
NS_IMETHOD GetOwnerDocument(nsIDOMDocument** aOwnerDocument) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return nsINode::GetOwnerDocument(aOwnerDocument); \
} \
NS_IMETHOD InsertBefore(nsIDOMNode* aNewChild, nsIDOMNode* aRefChild, nsIDOMNode** aResult) __VA_ARGS__ \
NS_IMETHOD InsertBefore(nsIDOMNode* aNewChild, nsIDOMNode* aRefChild, nsIDOMNode** aResult) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return ReplaceOrInsertBefore(false, aNewChild, aRefChild, aResult); \
} \
NS_IMETHOD ReplaceChild(nsIDOMNode* aNewChild, nsIDOMNode* aOldChild, nsIDOMNode** aResult) __VA_ARGS__ \
NS_IMETHOD ReplaceChild(nsIDOMNode* aNewChild, nsIDOMNode* aOldChild, nsIDOMNode** aResult) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return ReplaceOrInsertBefore(true, aNewChild, aOldChild, aResult); \
} \
NS_IMETHOD RemoveChild(nsIDOMNode* aOldChild, nsIDOMNode** aResult) __VA_ARGS__ \
NS_IMETHOD RemoveChild(nsIDOMNode* aOldChild, nsIDOMNode** aResult) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return nsINode::RemoveChild(aOldChild, aResult); \
} \
NS_IMETHOD AppendChild(nsIDOMNode* aNewChild, nsIDOMNode** aResult) __VA_ARGS__ \
NS_IMETHOD AppendChild(nsIDOMNode* aNewChild, nsIDOMNode** aResult) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return InsertBefore(aNewChild, nullptr, aResult); \
} \
NS_IMETHOD HasChildNodes(bool* aResult) __VA_ARGS__ \
NS_IMETHOD HasChildNodes(bool* aResult) __VA_ARGS__ MOZ_OVERRIDE \
{ \
*aResult = nsINode::HasChildNodes(); \
return NS_OK; \
} \
NS_IMETHOD CloneNode(bool aDeep, uint8_t aArgc, nsIDOMNode** aResult) __VA_ARGS__ \
NS_IMETHOD CloneNode(bool aDeep, uint8_t aArgc, nsIDOMNode** aResult) __VA_ARGS__ MOZ_OVERRIDE \
{ \
if (aArgc == 0) { \
aDeep = true; \
@ -1964,80 +1964,80 @@ ToCanonicalSupports(nsINode* aPointer)
*aResult = clone.forget().take()->AsDOMNode(); \
return NS_OK; \
} \
NS_IMETHOD Normalize() __VA_ARGS__ \
NS_IMETHOD Normalize() __VA_ARGS__ MOZ_OVERRIDE \
{ \
nsINode::Normalize(); \
return NS_OK; \
} \
NS_IMETHOD GetNamespaceURI(nsAString& aNamespaceURI) __VA_ARGS__ \
NS_IMETHOD GetNamespaceURI(nsAString& aNamespaceURI) __VA_ARGS__ MOZ_OVERRIDE \
{ \
nsINode::GetNamespaceURI(aNamespaceURI); \
return NS_OK; \
} \
NS_IMETHOD GetPrefix(nsAString& aPrefix) __VA_ARGS__ \
NS_IMETHOD GetPrefix(nsAString& aPrefix) __VA_ARGS__ MOZ_OVERRIDE \
{ \
nsINode::GetPrefix(aPrefix); \
return NS_OK; \
} \
NS_IMETHOD GetLocalName(nsAString& aLocalName) __VA_ARGS__ \
NS_IMETHOD GetLocalName(nsAString& aLocalName) __VA_ARGS__ MOZ_OVERRIDE \
{ \
aLocalName = nsINode::LocalName(); \
return NS_OK; \
} \
NS_IMETHOD UnusedPlaceholder(bool* aResult) __VA_ARGS__ \
NS_IMETHOD UnusedPlaceholder(bool* aResult) __VA_ARGS__ MOZ_OVERRIDE \
{ \
*aResult = false; \
return NS_OK; \
} \
NS_IMETHOD GetDOMBaseURI(nsAString& aBaseURI) __VA_ARGS__ \
NS_IMETHOD GetDOMBaseURI(nsAString& aBaseURI) __VA_ARGS__ MOZ_OVERRIDE \
{ \
nsINode::GetBaseURI(aBaseURI); \
return NS_OK; \
} \
NS_IMETHOD CompareDocumentPosition(nsIDOMNode* aOther, uint16_t* aResult) __VA_ARGS__ \
NS_IMETHOD CompareDocumentPosition(nsIDOMNode* aOther, uint16_t* aResult) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return nsINode::CompareDocumentPosition(aOther, aResult); \
} \
NS_IMETHOD GetTextContent(nsAString& aTextContent) __VA_ARGS__ \
NS_IMETHOD GetTextContent(nsAString& aTextContent) __VA_ARGS__ MOZ_OVERRIDE \
{ \
mozilla::ErrorResult rv; \
nsINode::GetTextContent(aTextContent, rv); \
return rv.ErrorCode(); \
} \
NS_IMETHOD SetTextContent(const nsAString& aTextContent) __VA_ARGS__ \
NS_IMETHOD SetTextContent(const nsAString& aTextContent) __VA_ARGS__ MOZ_OVERRIDE \
{ \
mozilla::ErrorResult rv; \
nsINode::SetTextContent(aTextContent, rv); \
return rv.ErrorCode(); \
} \
NS_IMETHOD LookupPrefix(const nsAString& aNamespaceURI, nsAString& aResult) __VA_ARGS__ \
NS_IMETHOD LookupPrefix(const nsAString& aNamespaceURI, nsAString& aResult) __VA_ARGS__ MOZ_OVERRIDE \
{ \
nsINode::LookupPrefix(aNamespaceURI, aResult); \
return NS_OK; \
} \
NS_IMETHOD IsDefaultNamespace(const nsAString& aNamespaceURI, bool* aResult) __VA_ARGS__ \
NS_IMETHOD IsDefaultNamespace(const nsAString& aNamespaceURI, bool* aResult) __VA_ARGS__ MOZ_OVERRIDE \
{ \
*aResult = nsINode::IsDefaultNamespace(aNamespaceURI); \
return NS_OK; \
} \
NS_IMETHOD LookupNamespaceURI(const nsAString& aPrefix, nsAString& aResult) __VA_ARGS__ \
NS_IMETHOD LookupNamespaceURI(const nsAString& aPrefix, nsAString& aResult) __VA_ARGS__ MOZ_OVERRIDE \
{ \
nsINode::LookupNamespaceURI(aPrefix, aResult); \
return NS_OK; \
} \
NS_IMETHOD IsEqualNode(nsIDOMNode* aArg, bool* aResult) __VA_ARGS__ \
NS_IMETHOD IsEqualNode(nsIDOMNode* aArg, bool* aResult) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return nsINode::IsEqualNode(aArg, aResult); \
} \
NS_IMETHOD SetUserData(const nsAString& aKey, nsIVariant* aData, nsIVariant** aResult) __VA_ARGS__ \
NS_IMETHOD SetUserData(const nsAString& aKey, nsIVariant* aData, nsIVariant** aResult) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return nsINode::SetUserData(aKey, aData, aResult); \
} \
NS_IMETHOD GetUserData(const nsAString& aKey, nsIVariant** aResult) __VA_ARGS__ \
NS_IMETHOD GetUserData(const nsAString& aKey, nsIVariant** aResult) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return nsINode::GetUserData(aKey, aResult); \
} \
NS_IMETHOD Contains(nsIDOMNode* aOther, bool* aResult) __VA_ARGS__ \
NS_IMETHOD Contains(nsIDOMNode* aOther, bool* aResult) __VA_ARGS__ MOZ_OVERRIDE \
{ \
return nsINode::Contains(aOther, aResult); \
}

4
dom/base/nsInProcessTabChildGlobal.h
View File

@ -50,7 +50,7 @@ public:
nsIPrincipal* aPrincipal,
JSContext* aCx,
uint8_t aArgc,
JS::MutableHandle<JS::Value> aRetval)
JS::MutableHandle<JS::Value> aRetval) MOZ_OVERRIDE
{
return mMessageManager
? mMessageManager->SendSyncMessage(aMessageName, aObject, aRemote,
@ -63,7 +63,7 @@ public:
nsIPrincipal* aPrincipal,
JSContext* aCx,
uint8_t aArgc,
JS::MutableHandle<JS::Value> aRetval)
JS::MutableHandle<JS::Value> aRetval) MOZ_OVERRIDE
{
return mMessageManager
? mMessageManager->SendRpcMessage(aMessageName, aObject, aRemote,

2
dom/base/nsJSEnvironment.cpp
View File

@ -2942,7 +2942,7 @@ public:
NS_DECL_NSIARRAY
// nsIJSArgArray
nsresult GetArgs(uint32_t *argc, void **argv);
nsresult GetArgs(uint32_t* argc, void** argv) MOZ_OVERRIDE;
void ReleaseJSObjects();

8
dom/base/nsJSTimeoutHandler.cpp
View File

@ -42,18 +42,18 @@ public:
const nsAString& aExpression, bool* aAllowEval,
ErrorResult& aError);
virtual const char16_t *GetHandlerText();
virtual Function* GetCallback()
virtual const char16_t* GetHandlerText() MOZ_OVERRIDE;
virtual Function* GetCallback() MOZ_OVERRIDE
{
return mFunction;
}
virtual void GetLocation(const char **aFileName, uint32_t *aLineNo)
virtual void GetLocation(const char** aFileName, uint32_t* aLineNo) MOZ_OVERRIDE
{
*aFileName = mFileName.get();
*aLineNo = mLineNo;
}
virtual const nsTArray<JS::Value>& GetArgs()
virtual const nsTArray<JS::Value>& GetArgs() MOZ_OVERRIDE
{
return mArgs;
}

4
dom/base/nsObjectLoadingContent.cpp
View File

@ -361,10 +361,10 @@ public:
}
// nsRunnable
NS_IMETHOD Run();
NS_IMETHOD Run() MOZ_OVERRIDE;
// nsITimerCallback
NS_IMETHOD Notify(nsITimer *timer);
NS_IMETHOD Notify(nsITimer* timer) MOZ_OVERRIDE;
protected:
virtual ~nsStopPluginRunnable() {}

6
dom/base/nsReferencedElement.h
View File

@ -141,8 +141,8 @@ private:
}
return NS_OK;
}
virtual void SetTo(Element* aTo) { mTo = aTo; }
virtual void Clear()
virtual void SetTo(Element* aTo) MOZ_OVERRIDE { mTo = aTo; }
virtual void Clear() MOZ_OVERRIDE
{
Notification::Clear(); mFrom = nullptr; mTo = nullptr;
}
@ -172,7 +172,7 @@ private:
private:
virtual ~DocumentLoadNotification() {}
virtual void SetTo(Element* aTo) { }
virtual void SetTo(Element* aTo) MOZ_OVERRIDE { }
nsString mRef;
};

2
dom/base/nsScreen.h
View File

@ -124,7 +124,7 @@ public:
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
void Notify(const mozilla::hal::ScreenConfiguration& aConfiguration);
void Notify(const mozilla::hal::ScreenConfiguration& aConfiguration) MOZ_OVERRIDE;
protected:
nsDeviceContext* GetDeviceContext();

2
dom/base/nsStyledElement.h
View File

@ -36,7 +36,7 @@ protected:
public:
// nsIContent interface methods
virtual mozilla::css::StyleRule* GetInlineStyleRule();
virtual mozilla::css::StyleRule* GetInlineStyleRule() MOZ_OVERRIDE;
virtual nsresult SetInlineStyleRule(mozilla::css::StyleRule* aStyleRule,
const nsAString* aSerialized,
bool aNotify) MOZ_OVERRIDE;

6
dom/base/nsTextNode.cpp
View File

@ -47,15 +47,15 @@ public:
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers);
bool aCompileEventHandlers) MOZ_OVERRIDE;
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true);
bool aNullParent = true) MOZ_OVERRIDE;
NS_DECL_NSIMUTATIONOBSERVER_ATTRIBUTECHANGED
NS_DECL_NSIMUTATIONOBSERVER_NODEWILLBEDESTROYED
virtual nsGenericDOMDataNode *CloneDataNode(mozilla::dom::NodeInfo *aNodeInfo,
bool aCloneText) const
bool aCloneText) const MOZ_OVERRIDE
{
already_AddRefed<mozilla::dom::NodeInfo> ni =
nsRefPtr<mozilla::dom::NodeInfo>(aNodeInfo).forget();

2
dom/base/nsTextNode.h
View File

@ -57,7 +57,7 @@ public:
NS_FORWARD_NSIDOMTEXT(nsGenericDOMDataNode::)
// nsINode
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
virtual nsGenericDOMDataNode* CloneDataNode(mozilla::dom::NodeInfo *aNodeInfo,
bool aCloneText) const MOZ_OVERRIDE;

2
dom/base/nsWindowMemoryReporter.h
View File

@ -175,7 +175,7 @@ private:
NS_IMETHOD
CollectReports(nsIHandleReportCallback* aHandleReport, nsISupports* aData,
bool aAnonymize)
bool aAnonymize) MOZ_OVERRIDE
{
return MOZ_COLLECT_REPORT(
"ghost-windows", KIND_OTHER, UNITS_COUNT, DistinguishedAmount(),

2
dom/base/nsXMLHttpRequest.cpp
View File

@ -3426,7 +3426,7 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS(AsyncVerifyRedirectCallbackForwarder)
// nsIAsyncVerifyRedirectCallback implementation
NS_IMETHOD OnRedirectVerifyCallback(nsresult result)
NS_IMETHOD OnRedirectVerifyCallback(nsresult result) MOZ_OVERRIDE
{
mXHR->OnRedirectVerifyCallback(result);

4
dom/base/nsXMLHttpRequest.h
View File

@ -143,7 +143,7 @@ public:
IMPL_EVENT_HANDLER(timeout)
IMPL_EVENT_HANDLER(loadend)
virtual void DisconnectFromOwner();
virtual void DisconnectFromOwner() MOZ_OVERRIDE;
};
class nsXMLHttpRequestUpload MOZ_FINAL : public nsXHREventTarget,
@ -289,7 +289,7 @@ public:
// nsISizeOfEventTarget
virtual size_t
SizeOfEventTargetIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
SizeOfEventTargetIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsXHREventTarget)

9
dom/interfaces/core/nsIDOMElement.idl
View File

@ -7,6 +7,15 @@
interface nsIDOMMozNamedAttrMap;
%{C++
// Undo the windows.h damage
#undef GetMessage
#undef CreateEvent
#undef GetClassName
#undef GetBinaryType
#undef RemoveDirectory
%}
/**
* The nsIDOMElement interface represents an element in an HTML or
* XML document.

2
widget/windows/WidgetTraceEvent.cpp
View File

@ -91,7 +91,7 @@ namespace mozilla {
bool InitWidgetTracing()
{
sEventHandle = CreateEvent(nullptr, FALSE, FALSE, nullptr);
sEventHandle = CreateEventW(nullptr, FALSE, FALSE, nullptr);
return sEventHandle != nullptr;
}

8
widget/windows/WinUtils.h
View File

@ -11,6 +11,14 @@
#include <shobjidl.h>
#include <uxtheme.h>
#include <dwmapi.h>
// Undo the windows.h damage
#undef GetMessage
#undef CreateEvent
#undef GetClassName
#undef GetBinaryType
#undef RemoveDirectory
#include "nsAutoPtr.h"
#include "nsString.h"
#include "nsRegion.h"