diff --git a/accessible/atk/AccessibleWrap.h b/accessible/atk/AccessibleWrap.h index 57ca43439cf4..62a4ba68b55e 100644 --- a/accessible/atk/AccessibleWrap.h +++ b/accessible/atk/AccessibleWrap.h @@ -52,11 +52,11 @@ public: virtual ~AccessibleWrap(); void ShutdownAtkObject(); - virtual void Shutdown() MOZ_OVERRIDE; + virtual void Shutdown() override; // return the atk object for this AccessibleWrap - virtual void GetNativeInterface(void** aOutAccessible) MOZ_OVERRIDE; - virtual nsresult HandleAccEvent(AccEvent* aEvent) MOZ_OVERRIDE; + virtual void GetNativeInterface(void** aOutAccessible) override; + virtual nsresult HandleAccEvent(AccEvent* aEvent) override; AtkObject * GetAtkObject(void); static AtkObject* GetAtkObject(Accessible* aAccessible); diff --git a/accessible/atk/ApplicationAccessibleWrap.h b/accessible/atk/ApplicationAccessibleWrap.h index c286e1f0ea94..468616b6cc69 100644 --- a/accessible/atk/ApplicationAccessibleWrap.h +++ b/accessible/atk/ApplicationAccessibleWrap.h @@ -19,14 +19,14 @@ public: virtual ~ApplicationAccessibleWrap(); // Accessible - virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE; - virtual bool InsertChildAt(uint32_t aIdx, Accessible* aChild) MOZ_OVERRIDE; - virtual bool RemoveChild(Accessible* aChild) MOZ_OVERRIDE; + virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) override; + virtual bool InsertChildAt(uint32_t aIdx, Accessible* aChild) override; + virtual bool RemoveChild(Accessible* aChild) override; /** * Return the atk object for app root accessible. */ - virtual void GetNativeInterface(void** aOutAccessible) MOZ_OVERRIDE; + virtual void GetNativeInterface(void** aOutAccessible) override; }; } // namespace a11y diff --git a/accessible/atk/AtkSocketAccessible.h b/accessible/atk/AtkSocketAccessible.h index 476dcecb5d59..3b63a8e73049 100644 --- a/accessible/atk/AtkSocketAccessible.h +++ b/accessible/atk/AtkSocketAccessible.h @@ -45,9 +45,9 @@ public: AtkSocketAccessible(nsIContent* aContent, DocAccessible* aDoc, const nsCString& aPlugId); - virtual void Shutdown() MOZ_OVERRIDE; + virtual void Shutdown() override; - virtual void GetNativeInterface(void** aOutAccessible) MOZ_OVERRIDE; + virtual void GetNativeInterface(void** aOutAccessible) override; }; } // namespace a11y diff --git a/accessible/atk/RootAccessibleWrap.h b/accessible/atk/RootAccessibleWrap.h index 50a5a807ab04..cf4b5c18cefa 100644 --- a/accessible/atk/RootAccessibleWrap.h +++ b/accessible/atk/RootAccessibleWrap.h @@ -20,7 +20,7 @@ typedef RootAccessible RootAccessibleWrap; * It is added into root when the toplevel window is created, and removed * from root when the toplevel window is destroyed. */ -class GtkWindowAccessible MOZ_FINAL : public DummyAccessible +class GtkWindowAccessible final : public DummyAccessible { public: explicit GtkWindowAccessible(AtkObject* aAccessible); diff --git a/accessible/base/AccCollector.h b/accessible/base/AccCollector.h index f7c46f3adec0..fde121eaea38 100644 --- a/accessible/base/AccCollector.h +++ b/accessible/base/AccCollector.h @@ -71,20 +71,20 @@ private: * Collect embedded objects. Provide quick access to accessible by index and * vice versa. */ -class EmbeddedObjCollector MOZ_FINAL : public AccCollector +class EmbeddedObjCollector final : public AccCollector { public: virtual ~EmbeddedObjCollector() { } public: - virtual int32_t GetIndexAt(Accessible* aAccessible) MOZ_OVERRIDE; + virtual int32_t GetIndexAt(Accessible* aAccessible) override; protected: // Make sure it's used by Accessible class only. explicit EmbeddedObjCollector(Accessible* aRoot) : AccCollector(aRoot, filters::GetEmbeddedObject) { } - virtual void AppendObject(Accessible* aAccessible) MOZ_OVERRIDE; + virtual void AppendObject(Accessible* aAccessible) override; friend class Accessible; }; diff --git a/accessible/base/AccEvent.h b/accessible/base/AccEvent.h index 29dc537a1c74..68515c742dca 100644 --- a/accessible/base/AccEvent.h +++ b/accessible/base/AccEvent.h @@ -154,7 +154,7 @@ public: // AccEvent static const EventGroup kEventGroup = eStateChangeEvent; - virtual unsigned int GetEventGroups() const MOZ_OVERRIDE + virtual unsigned int GetEventGroups() const override { return AccEvent::GetEventGroups() | (1U << eStateChangeEvent); } @@ -183,7 +183,7 @@ public: // AccEvent static const EventGroup kEventGroup = eTextChangeEvent; - virtual unsigned int GetEventGroups() const MOZ_OVERRIDE + virtual unsigned int GetEventGroups() const override { return AccEvent::GetEventGroups() | (1U << eTextChangeEvent); } @@ -223,7 +223,7 @@ public: // Event static const EventGroup kEventGroup = eMutationEvent; - virtual unsigned int GetEventGroups() const MOZ_OVERRIDE + virtual unsigned int GetEventGroups() const override { return AccEvent::GetEventGroups() | (1U << eMutationEvent); } @@ -253,7 +253,7 @@ public: // Event static const EventGroup kEventGroup = eHideEvent; - virtual unsigned int GetEventGroups() const MOZ_OVERRIDE + virtual unsigned int GetEventGroups() const override { return AccMutationEvent::GetEventGroups() | (1U << eHideEvent); } @@ -281,7 +281,7 @@ public: // Event static const EventGroup kEventGroup = eShowEvent; - virtual unsigned int GetEventGroups() const MOZ_OVERRIDE + virtual unsigned int GetEventGroups() const override { return AccMutationEvent::GetEventGroups() | (1U << eShowEvent); } @@ -301,7 +301,7 @@ public: // Event static const EventGroup kEventGroup = eReorderEvent; - virtual unsigned int GetEventGroups() const MOZ_OVERRIDE + virtual unsigned int GetEventGroups() const override { return AccEvent::GetEventGroups() | (1U << eReorderEvent); } @@ -354,7 +354,7 @@ public: // AccEvent static const EventGroup kEventGroup = eCaretMoveEvent; - virtual unsigned int GetEventGroups() const MOZ_OVERRIDE + virtual unsigned int GetEventGroups() const override { return AccEvent::GetEventGroups() | (1U << eCaretMoveEvent); } @@ -380,7 +380,7 @@ public: // AccEvent static const EventGroup kEventGroup = eTextSelChangeEvent; - virtual unsigned int GetEventGroups() const MOZ_OVERRIDE + virtual unsigned int GetEventGroups() const override { return AccEvent::GetEventGroups() | (1U << eTextSelChangeEvent); } @@ -419,7 +419,7 @@ public: // AccEvent static const EventGroup kEventGroup = eSelectionChangeEvent; - virtual unsigned int GetEventGroups() const MOZ_OVERRIDE + virtual unsigned int GetEventGroups() const override { return AccEvent::GetEventGroups() | (1U << eSelectionChangeEvent); } @@ -449,7 +449,7 @@ public: // AccEvent static const EventGroup kEventGroup = eTableChangeEvent; - virtual unsigned int GetEventGroups() const MOZ_OVERRIDE + virtual unsigned int GetEventGroups() const override { return AccEvent::GetEventGroups() | (1U << eTableChangeEvent); } @@ -479,7 +479,7 @@ public: // AccEvent static const EventGroup kEventGroup = eVirtualCursorChangeEvent; - virtual unsigned int GetEventGroups() const MOZ_OVERRIDE + virtual unsigned int GetEventGroups() const override { return AccEvent::GetEventGroups() | (1U << eVirtualCursorChangeEvent); } @@ -509,7 +509,7 @@ public: // AccEvent static const EventGroup kEventGroup = eObjectAttrChangedEvent; - virtual unsigned int GetEventGroups() const MOZ_OVERRIDE + virtual unsigned int GetEventGroups() const override { return AccEvent::GetEventGroups() | (1U << eObjectAttrChangedEvent); } diff --git a/accessible/base/AccIterator.h b/accessible/base/AccIterator.h index 016507c0c2a3..17c988ccd9fb 100644 --- a/accessible/base/AccIterator.h +++ b/accessible/base/AccIterator.h @@ -43,7 +43,7 @@ public: * Return next accessible complying with filter function. Return the first * accessible for the first time. */ - virtual Accessible* Next() MOZ_OVERRIDE; + virtual Accessible* Next() override; private: AccIterator(); @@ -89,7 +89,7 @@ public: /** * Return next related accessible for the given dependent accessible. */ - virtual Accessible* Next() MOZ_OVERRIDE; + virtual Accessible* Next() override; private: RelatedAccIterator(); @@ -123,7 +123,7 @@ public: /** * Return next label accessible associated with the given element. */ - virtual Accessible* Next() MOZ_OVERRIDE; + virtual Accessible* Next() override; private: HTMLLabelIterator(); @@ -150,7 +150,7 @@ public: /** * Return next output accessible associated with the given element. */ - virtual Accessible* Next() MOZ_OVERRIDE; + virtual Accessible* Next() override; private: HTMLOutputIterator(); @@ -173,7 +173,7 @@ public: /** * Return next label accessible associated with the given element. */ - virtual Accessible* Next() MOZ_OVERRIDE; + virtual Accessible* Next() override; private: XULLabelIterator(); @@ -196,7 +196,7 @@ public: /** * Return next description accessible associated with the given element. */ - virtual Accessible* Next() MOZ_OVERRIDE; + virtual Accessible* Next() override; private: XULDescriptionIterator(); @@ -234,7 +234,7 @@ public: nsIContent* GetElem(const nsDependentSubstring& aID); // AccIterable - virtual Accessible* Next() MOZ_OVERRIDE; + virtual Accessible* Next() override; private: IDRefsIterator(); @@ -251,13 +251,13 @@ private: /** * Iterates over related accessible referred by aria-owns. */ -class ARIAOwnedByIterator MOZ_FINAL : public RelatedAccIterator +class ARIAOwnedByIterator final : public RelatedAccIterator { public: explicit ARIAOwnedByIterator(const Accessible* aDependent); virtual ~ARIAOwnedByIterator() { } - virtual Accessible* Next() MOZ_OVERRIDE; + virtual Accessible* Next() override; private: ARIAOwnedByIterator() = delete; @@ -271,13 +271,13 @@ private: /** * Iterates over related accessible referred by aria-owns. */ -class ARIAOwnsIterator MOZ_FINAL : public AccIterable +class ARIAOwnsIterator final : public AccIterable { public: explicit ARIAOwnsIterator(const Accessible* aOwner); virtual ~ARIAOwnsIterator() { } - virtual Accessible* Next() MOZ_OVERRIDE; + virtual Accessible* Next() override; private: ARIAOwnsIterator() = delete; @@ -299,7 +299,7 @@ public: explicit SingleAccIterator(Accessible* aTarget): mAcc(aTarget) { } virtual ~SingleAccIterator() { } - virtual Accessible* Next() MOZ_OVERRIDE; + virtual Accessible* Next() override; private: SingleAccIterator(); @@ -320,7 +320,7 @@ public: mContainer(aItemContainer), mAnchor(nullptr) { } virtual ~ItemIterator() { } - virtual Accessible* Next() MOZ_OVERRIDE; + virtual Accessible* Next() override; private: ItemIterator() = delete; @@ -342,7 +342,7 @@ public: int32_t aRowIdx); virtual ~XULTreeItemIterator() { } - virtual Accessible* Next() MOZ_OVERRIDE; + virtual Accessible* Next() override; private: XULTreeItemIterator() = delete; diff --git a/accessible/base/NotificationController.h b/accessible/base/NotificationController.h index de8dba3cd462..24af2af261f4 100644 --- a/accessible/base/NotificationController.h +++ b/accessible/base/NotificationController.h @@ -64,7 +64,7 @@ public: mInstance(aInstance), mCallback(aCallback), mArg(aArg) { } virtual ~TNotification() { mInstance = nullptr; } - virtual void Process() MOZ_OVERRIDE + virtual void Process() override { (mInstance->*mCallback)(mArg); @@ -85,14 +85,14 @@ private: /** * Used to process notifications from core for the document accessible. */ -class NotificationController MOZ_FINAL : public EventQueue, +class NotificationController final : public EventQueue, public nsARefreshObserver { public: NotificationController(DocAccessible* aDocument, nsIPresShell* aPresShell); - NS_IMETHOD_(MozExternalRefCountType) AddRef(void) MOZ_OVERRIDE; - NS_IMETHOD_(MozExternalRefCountType) Release(void) MOZ_OVERRIDE; + NS_IMETHOD_(MozExternalRefCountType) AddRef(void) override; + NS_IMETHOD_(MozExternalRefCountType) Release(void) override; NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(NotificationController) @@ -203,7 +203,7 @@ private: NotificationController& operator = (const NotificationController&); // nsARefreshObserver - virtual void WillRefresh(mozilla::TimeStamp aTime) MOZ_OVERRIDE; + virtual void WillRefresh(mozilla::TimeStamp aTime) override; private: /** diff --git a/accessible/base/SelectionManager.cpp b/accessible/base/SelectionManager.cpp index 1469390b1662..d165bad23cbc 100644 --- a/accessible/base/SelectionManager.cpp +++ b/accessible/base/SelectionManager.cpp @@ -24,7 +24,7 @@ using namespace mozilla; using namespace mozilla::a11y; using mozilla::dom::Selection; -struct mozilla::a11y::SelData MOZ_FINAL +struct mozilla::a11y::SelData final { SelData(Selection* aSel, int32_t aReason) : mSel(aSel), mReason(aReason) {} diff --git a/accessible/base/TextAttrs.h b/accessible/base/TextAttrs.h index 7f6967e40c2b..0e7deffab39a 100644 --- a/accessible/base/TextAttrs.h +++ b/accessible/base/TextAttrs.h @@ -130,7 +130,7 @@ protected: // TextAttr virtual void Expose(nsIPersistentProperties* aAttributes, - bool aIncludeDefAttrValue) MOZ_OVERRIDE + bool aIncludeDefAttrValue) override { if (mGetRootValue) { if (mIsRootDefined) @@ -148,7 +148,7 @@ protected: ExposeValue(aAttributes, mRootNativeValue); } - virtual bool Equal(Accessible* aAccessible) MOZ_OVERRIDE + virtual bool Equal(Accessible* aAccessible) override { T nativeValue; bool isDefined = GetValueFor(aAccessible, &nativeValue); @@ -203,9 +203,9 @@ protected: protected: // TextAttr - virtual bool GetValueFor(Accessible* aAccessible, nsString* aValue) MOZ_OVERRIDE; + virtual bool GetValueFor(Accessible* aAccessible, nsString* aValue) override; virtual void ExposeValue(nsIPersistentProperties* aAttributes, - const nsString& aValue) MOZ_OVERRIDE; + const nsString& aValue) override; private: nsCOMPtr mRootContent; @@ -234,9 +234,9 @@ protected: }; // TextAttr - virtual bool GetValueFor(Accessible* aAccessible, uint32_t* aValue) MOZ_OVERRIDE; + virtual bool GetValueFor(Accessible* aAccessible, uint32_t* aValue) override; virtual void ExposeValue(nsIPersistentProperties* aAttributes, - const uint32_t& aValue) MOZ_OVERRIDE; + const uint32_t& aValue) override; private: bool GetValue(nsIContent* aElm, uint32_t* aValue); @@ -257,9 +257,9 @@ protected: // TextAttr virtual bool GetValueFor(Accessible* aAccessible, nscolor* aValue) - MOZ_OVERRIDE; + override; virtual void ExposeValue(nsIPersistentProperties* aAttributes, - const nscolor& aValue) MOZ_OVERRIDE; + const nscolor& aValue) override; private: bool GetColor(nsIFrame* aFrame, nscolor* aColor); @@ -280,9 +280,9 @@ protected: // TTextAttr virtual bool GetValueFor(Accessible* aAccessible, nscolor* aValue) - MOZ_OVERRIDE; + override; virtual void ExposeValue(nsIPersistentProperties* aAttributes, - const nscolor& aValue) MOZ_OVERRIDE; + const nscolor& aValue) override; }; @@ -299,9 +299,9 @@ protected: // TTextAttr virtual bool GetValueFor(Accessible* aAccessible, nsString* aValue) - MOZ_OVERRIDE; + override; virtual void ExposeValue(nsIPersistentProperties* aAttributes, - const nsString& aValue) MOZ_OVERRIDE; + const nsString& aValue) override; private: @@ -322,9 +322,9 @@ protected: // TTextAttr virtual bool GetValueFor(Accessible* aAccessible, nscoord* aValue) - MOZ_OVERRIDE; + override; virtual void ExposeValue(nsIPersistentProperties* aAttributes, - const nscoord& aValue) MOZ_OVERRIDE; + const nscoord& aValue) override; private: nsDeviceContext* mDC; @@ -344,9 +344,9 @@ protected: // TTextAttr virtual bool GetValueFor(Accessible* aContent, nscoord* aValue) - MOZ_OVERRIDE; + override; virtual void ExposeValue(nsIPersistentProperties* aAttributes, - const nscoord& aValue) MOZ_OVERRIDE; + const nscoord& aValue) override; }; @@ -363,9 +363,9 @@ protected: // TTextAttr virtual bool GetValueFor(Accessible* aAccessible, int32_t* aValue) - MOZ_OVERRIDE; + override; virtual void ExposeValue(nsIPersistentProperties* aAttributes, - const int32_t& aValue) MOZ_OVERRIDE; + const int32_t& aValue) override; private: int32_t GetFontWeight(nsIFrame* aFrame); @@ -384,9 +384,9 @@ protected: protected: // TextAttr virtual bool GetValueFor(Accessible* aAccessible, bool* aValue) - MOZ_OVERRIDE; + override; virtual void ExposeValue(nsIPersistentProperties* aAttributes, - const bool& aValue) MOZ_OVERRIDE; + const bool& aValue) override; }; @@ -436,9 +436,9 @@ protected: // TextAttr virtual bool GetValueFor(Accessible* aAccessible, TextDecorValue* aValue) - MOZ_OVERRIDE; + override; virtual void ExposeValue(nsIPersistentProperties* aAttributes, - const TextDecorValue& aValue) MOZ_OVERRIDE; + const TextDecorValue& aValue) override; }; /** @@ -462,9 +462,9 @@ protected: // TextAttr virtual bool GetValueFor(Accessible* aAccessible, TextPosValue* aValue) - MOZ_OVERRIDE; + override; virtual void ExposeValue(nsIPersistentProperties* aAttributes, - const TextPosValue& aValue) MOZ_OVERRIDE; + const TextPosValue& aValue) override; private: TextPosValue GetTextPosValue(nsIFrame* aFrame) const; diff --git a/accessible/base/TextRange.h b/accessible/base/TextRange.h index 676dd0b73c2f..be1077cdad0f 100644 --- a/accessible/base/TextRange.h +++ b/accessible/base/TextRange.h @@ -24,7 +24,7 @@ class HyperTextAccessible; /** * A text point (hyper text + offset), represents a boundary of text range. */ -struct TextPoint MOZ_FINAL +struct TextPoint final { TextPoint(HyperTextAccessible* aContainer, int32_t aOffset) : mContainer(aContainer), mOffset(aOffset) { } @@ -42,7 +42,7 @@ struct TextPoint MOZ_FINAL /** * Represents a text range within the text control or document. */ -class TextRange MOZ_FINAL +class TextRange final { public: TextRange(HyperTextAccessible* aRoot, diff --git a/accessible/base/TreeWalker.h b/accessible/base/TreeWalker.h index d34e5e9bb2e2..745d931ec4e5 100644 --- a/accessible/base/TreeWalker.h +++ b/accessible/base/TreeWalker.h @@ -22,7 +22,7 @@ class DocAccessible; /** * This class is used to walk the DOM tree to create accessible tree. */ -class TreeWalker MOZ_FINAL +class TreeWalker final { public: enum { diff --git a/accessible/base/nsAccessibilityService.cpp b/accessible/base/nsAccessibilityService.cpp index 9d6b5e0976f0..78ddf1f2615c 100644 --- a/accessible/base/nsAccessibilityService.cpp +++ b/accessible/base/nsAccessibilityService.cpp @@ -345,7 +345,7 @@ nsAccessibilityService::GetRootDocumentAccessible(nsIPresShell* aPresShell, static StaticAutoPtr > > sPendingPlugins; static StaticAutoPtr > > sPluginTimers; -class PluginTimerCallBack MOZ_FINAL : public nsITimerCallback +class PluginTimerCallBack final : public nsITimerCallback { ~PluginTimerCallBack() {} @@ -354,7 +354,7 @@ public: NS_DECL_ISUPPORTS - NS_IMETHODIMP Notify(nsITimer* aTimer) MOZ_FINAL + NS_IMETHODIMP Notify(nsITimer* aTimer) final { if (!mContent->IsInDoc()) return NS_OK; diff --git a/accessible/base/nsAccessibilityService.h b/accessible/base/nsAccessibilityService.h index d3bcc5bbc534..667214c66ee8 100644 --- a/accessible/base/nsAccessibilityService.h +++ b/accessible/base/nsAccessibilityService.h @@ -63,7 +63,7 @@ struct MarkupMapInfo { } // namespace a11y } // namespace mozilla -class nsAccessibilityService MOZ_FINAL : public mozilla::a11y::DocManager, +class nsAccessibilityService final : public mozilla::a11y::DocManager, public mozilla::a11y::FocusManager, public mozilla::a11y::SelectionManager, public nsIAccessibilityService, @@ -83,7 +83,7 @@ public: // nsIAccessibilityService virtual Accessible* GetRootDocumentAccessible(nsIPresShell* aPresShell, - bool aCanCreate) MOZ_OVERRIDE; + bool aCanCreate) override; already_AddRefed CreatePluginAccessible(nsPluginFrame* aFrame, nsIContent* aContent, Accessible* aContext); @@ -92,10 +92,10 @@ public: * Adds/remove ATK root accessible for gtk+ native window to/from children * of the application accessible. */ - virtual Accessible* AddNativeRootAccessible(void* aAtkAccessible) MOZ_OVERRIDE; - virtual void RemoveNativeRootAccessible(Accessible* aRootAccessible) MOZ_OVERRIDE; + virtual Accessible* AddNativeRootAccessible(void* aAtkAccessible) override; + virtual void RemoveNativeRootAccessible(Accessible* aRootAccessible) override; - virtual bool HasAccessible(nsIDOMNode* aDOMNode) MOZ_OVERRIDE; + virtual bool HasAccessible(nsIDOMNode* aDOMNode) override; // nsAccesibilityService /** @@ -164,7 +164,7 @@ public: */ void RecreateAccessible(nsIPresShell* aPresShell, nsIContent* aContent); - virtual void FireAccessibleEvent(uint32_t aEvent, Accessible* aTarget) MOZ_OVERRIDE; + virtual void FireAccessibleEvent(uint32_t aEvent, Accessible* aTarget) override; // nsAccessibiltiyService diff --git a/accessible/base/nsAccessiblePivot.h b/accessible/base/nsAccessiblePivot.h index 188c6b097aaa..c47d1f3e81cb 100644 --- a/accessible/base/nsAccessiblePivot.h +++ b/accessible/base/nsAccessiblePivot.h @@ -20,7 +20,7 @@ class RuleCache; /** * Class represents an accessible pivot. */ -class nsAccessiblePivot MOZ_FINAL : public nsIAccessiblePivot +class nsAccessiblePivot final : public nsIAccessiblePivot { public: typedef mozilla::a11y::Accessible Accessible; diff --git a/accessible/generic/ARIAGridAccessible.h b/accessible/generic/ARIAGridAccessible.h index c40ab31a7ef9..7c56084898b5 100644 --- a/accessible/generic/ARIAGridAccessible.h +++ b/accessible/generic/ARIAGridAccessible.h @@ -25,27 +25,27 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual TableAccessible* AsTable() MOZ_OVERRIDE { return this; } + virtual TableAccessible* AsTable() override { return this; } // TableAccessible - virtual uint32_t ColCount() MOZ_OVERRIDE; - virtual uint32_t RowCount() MOZ_OVERRIDE; - virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex) MOZ_OVERRIDE; - virtual bool IsColSelected(uint32_t aColIdx) MOZ_OVERRIDE; - virtual bool IsRowSelected(uint32_t aRowIdx) MOZ_OVERRIDE; - virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx) MOZ_OVERRIDE; - virtual uint32_t SelectedCellCount() MOZ_OVERRIDE; - virtual uint32_t SelectedColCount() MOZ_OVERRIDE; - virtual uint32_t SelectedRowCount() MOZ_OVERRIDE; - virtual void SelectedCells(nsTArray* aCells) MOZ_OVERRIDE; - virtual void SelectedCellIndices(nsTArray* aCells) MOZ_OVERRIDE; - virtual void SelectedColIndices(nsTArray* aCols) MOZ_OVERRIDE; - virtual void SelectedRowIndices(nsTArray* aRows) MOZ_OVERRIDE; - virtual void SelectCol(uint32_t aColIdx) MOZ_OVERRIDE; - virtual void SelectRow(uint32_t aRowIdx) MOZ_OVERRIDE; - virtual void UnselectCol(uint32_t aColIdx) MOZ_OVERRIDE; - virtual void UnselectRow(uint32_t aRowIdx) MOZ_OVERRIDE; - virtual Accessible* AsAccessible() MOZ_OVERRIDE { return this; } + virtual uint32_t ColCount() override; + virtual uint32_t RowCount() override; + virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex) override; + virtual bool IsColSelected(uint32_t aColIdx) override; + virtual bool IsRowSelected(uint32_t aRowIdx) override; + virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx) override; + virtual uint32_t SelectedCellCount() override; + virtual uint32_t SelectedColCount() override; + virtual uint32_t SelectedRowCount() override; + virtual void SelectedCells(nsTArray* aCells) override; + virtual void SelectedCellIndices(nsTArray* aCells) override; + virtual void SelectedColIndices(nsTArray* aCols) override; + virtual void SelectedRowIndices(nsTArray* aRows) override; + virtual void SelectCol(uint32_t aColIdx) override; + virtual void SelectRow(uint32_t aRowIdx) override; + virtual void UnselectCol(uint32_t aColIdx) override; + virtual void UnselectRow(uint32_t aRowIdx) override; + virtual Accessible* AsAccessible() override { return this; } protected: virtual ~ARIAGridAccessible() {} @@ -85,9 +85,9 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual TableCellAccessible* AsTableCell() MOZ_OVERRIDE { return this; } - virtual void ApplyARIAState(uint64_t* aState) const MOZ_OVERRIDE; - virtual already_AddRefed NativeAttributes() MOZ_OVERRIDE; + virtual TableCellAccessible* AsTableCell() override { return this; } + virtual void ApplyARIAState(uint64_t* aState) const override; + virtual already_AddRefed NativeAttributes() override; protected: virtual ~ARIAGridCellAccessible() {} @@ -112,10 +112,10 @@ protected: int32_t RowIndexFor(Accessible* aRow) const; // TableCellAccessible - virtual TableAccessible* Table() const MOZ_OVERRIDE; - virtual uint32_t ColIdx() const MOZ_OVERRIDE; - virtual uint32_t RowIdx() const MOZ_OVERRIDE; - virtual bool Selected() MOZ_OVERRIDE; + virtual TableAccessible* Table() const override; + virtual uint32_t ColIdx() const override; + virtual uint32_t RowIdx() const override; + virtual bool Selected() override; }; } // namespace a11y diff --git a/accessible/generic/Accessible.cpp b/accessible/generic/Accessible.cpp index bcb8967f87fb..cea4204a9389 100644 --- a/accessible/generic/Accessible.cpp +++ b/accessible/generic/Accessible.cpp @@ -1723,13 +1723,13 @@ Accessible::GetNativeInterface(void** aNativeAccessible) void Accessible::DoCommand(nsIContent *aContent, uint32_t aActionIndex) { - class Runnable MOZ_FINAL : public nsRunnable + class Runnable final : public nsRunnable { public: Runnable(Accessible* aAcc, nsIContent* aContent, uint32_t aIdx) : mAcc(aAcc), mContent(aContent), mIdx(aIdx) { } - NS_IMETHOD Run() MOZ_OVERRIDE + NS_IMETHOD Run() override { if (mAcc) mAcc->DispatchClickEvent(mContent, mIdx); diff --git a/accessible/generic/ApplicationAccessible.h b/accessible/generic/ApplicationAccessible.h index 3bc0bfb21334..cee505134e7b 100644 --- a/accessible/generic/ApplicationAccessible.h +++ b/accessible/generic/ApplicationAccessible.h @@ -35,27 +35,27 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual void Shutdown() MOZ_OVERRIDE; - virtual nsIntRect Bounds() const MOZ_OVERRIDE; - virtual already_AddRefed NativeAttributes() MOZ_OVERRIDE; - virtual GroupPos GroupPosition() MOZ_OVERRIDE; - virtual ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE; - virtual void ApplyARIAState(uint64_t* aState) const MOZ_OVERRIDE; - virtual void Description(nsString& aDescription) MOZ_OVERRIDE; - virtual void Value(nsString& aValue) MOZ_OVERRIDE; - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t State() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE; + virtual void Shutdown() override; + virtual nsIntRect Bounds() const override; + virtual already_AddRefed NativeAttributes() override; + virtual GroupPos GroupPosition() override; + virtual ENameValueFlag Name(nsString& aName) override; + virtual void ApplyARIAState(uint64_t* aState) const override; + virtual void Description(nsString& aDescription) override; + virtual void Value(nsString& aValue) override; + virtual mozilla::a11y::role NativeRole() override; + virtual uint64_t State() override; + virtual uint64_t NativeState() override; + virtual Relation RelationByType(RelationType aType) override; virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY, - EWhichChildAtPoint aWhichChild) MOZ_OVERRIDE; - virtual Accessible* FocusedChild() MOZ_OVERRIDE; + EWhichChildAtPoint aWhichChild) override; + virtual Accessible* FocusedChild() override; - virtual void InvalidateChildren() MOZ_OVERRIDE; + virtual void InvalidateChildren() override; // ActionAccessible - virtual KeyBinding AccessKey() const MOZ_OVERRIDE; + virtual KeyBinding AccessKey() const override; // ApplicationAccessible void AppName(nsAString& aName) const @@ -88,9 +88,9 @@ protected: virtual ~ApplicationAccessible() {} // Accessible - virtual void CacheChildren() MOZ_OVERRIDE; + virtual void CacheChildren() override; virtual Accessible* GetSiblingAtOffset(int32_t aOffset, - nsresult *aError = nullptr) const MOZ_OVERRIDE; + nsresult *aError = nullptr) const override; private: nsCOMPtr mAppInfo; diff --git a/accessible/generic/BaseAccessibles.h b/accessible/generic/BaseAccessibles.h index 5a96395fcfc9..56ba5600f6e4 100644 --- a/accessible/generic/BaseAccessibles.h +++ b/accessible/generic/BaseAccessibles.h @@ -34,15 +34,15 @@ public: // Accessible virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY, - EWhichChildAtPoint aWhichChild) MOZ_OVERRIDE; - virtual bool InsertChildAt(uint32_t aIndex, Accessible* aChild) MOZ_OVERRIDE MOZ_FINAL; - virtual bool RemoveChild(Accessible* aChild) MOZ_OVERRIDE MOZ_FINAL; + EWhichChildAtPoint aWhichChild) override; + virtual bool InsertChildAt(uint32_t aIndex, Accessible* aChild) override final; + virtual bool RemoveChild(Accessible* aChild) override final; protected: virtual ~LeafAccessible() {} // Accessible - virtual void CacheChildren() MOZ_OVERRIDE; + virtual void CacheChildren() override; }; /** @@ -61,26 +61,26 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual void Shutdown() MOZ_OVERRIDE; - virtual void Value(nsString& aValue) MOZ_OVERRIDE; - virtual uint64_t NativeLinkState() const MOZ_OVERRIDE; - virtual void TakeFocus() MOZ_OVERRIDE; + virtual void Shutdown() override; + virtual void Value(nsString& aValue) override; + virtual uint64_t NativeLinkState() const override; + virtual void TakeFocus() override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t index) MOZ_OVERRIDE; - virtual KeyBinding AccessKey() const MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t index) override; + virtual KeyBinding AccessKey() const override; // HyperLinkAccessible - virtual already_AddRefed AnchorURIAt(uint32_t aAnchorIndex) MOZ_OVERRIDE; + virtual already_AddRefed AnchorURIAt(uint32_t aAnchorIndex) override; protected: virtual ~LinkableAccessible() {} // Accessible - virtual void BindToParent(Accessible* aParent, uint32_t aIndexInParent) MOZ_OVERRIDE; - virtual void UnbindFromParent() MOZ_OVERRIDE; + virtual void BindToParent(Accessible* aParent, uint32_t aIndexInParent) override; + virtual void UnbindFromParent() override; /** * Parent accessible that provides an action for this linkable accessible. @@ -100,11 +100,11 @@ public: EnumRoleAccessible(nsIContent* aContent, DocAccessible* aDoc) : AccessibleWrap(aContent, aDoc) { } - NS_IMETHOD QueryInterface(REFNSIID aIID, void** aPtr) MOZ_OVERRIDE + NS_IMETHOD QueryInterface(REFNSIID aIID, void** aPtr) override { return Accessible::QueryInterface(aIID, aPtr); } // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE { return R; } + virtual a11y::role NativeRole() override { return R; } protected: virtual ~EnumRoleAccessible() { } @@ -121,11 +121,11 @@ public: explicit DummyAccessible(DocAccessible* aDocument = nullptr) : AccessibleWrap(nullptr, aDocument) { } - virtual uint64_t NativeState() MOZ_OVERRIDE MOZ_FINAL; - virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE MOZ_FINAL; - virtual uint64_t NativeLinkState() const MOZ_OVERRIDE MOZ_FINAL; - virtual bool NativelyUnavailable() const MOZ_OVERRIDE MOZ_FINAL; - virtual void ApplyARIAState(uint64_t* aState) const MOZ_OVERRIDE MOZ_FINAL; + virtual uint64_t NativeState() override final; + virtual uint64_t NativeInteractiveState() const override final; + virtual uint64_t NativeLinkState() const override final; + virtual bool NativelyUnavailable() const override final; + virtual void ApplyARIAState(uint64_t* aState) const override final; protected: virtual ~DummyAccessible() { } diff --git a/accessible/generic/DocAccessible.h b/accessible/generic/DocAccessible.h index 98573f4a250d..ad54069cc065 100644 --- a/accessible/generic/DocAccessible.h +++ b/accessible/generic/DocAccessible.h @@ -56,39 +56,39 @@ public: nsIPresShell* aPresShell); // nsIScrollPositionListener - virtual void ScrollPositionWillChange(nscoord aX, nscoord aY) MOZ_OVERRIDE {} - virtual void ScrollPositionDidChange(nscoord aX, nscoord aY) MOZ_OVERRIDE; + virtual void ScrollPositionWillChange(nscoord aX, nscoord aY) override {} + virtual void ScrollPositionDidChange(nscoord aX, nscoord aY) override; // nsIDocumentObserver NS_DECL_NSIDOCUMENTOBSERVER // Accessible virtual void Init(); - virtual void Shutdown() MOZ_OVERRIDE; - virtual nsIFrame* GetFrame() const MOZ_OVERRIDE; - virtual nsINode* GetNode() const MOZ_OVERRIDE { return mDocumentNode; } + virtual void Shutdown() override; + virtual nsIFrame* GetFrame() const override; + virtual nsINode* GetNode() const override { return mDocumentNode; } nsIDocument* DocumentNode() const { return mDocumentNode; } - virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE; - virtual void Description(nsString& aDescription) MOZ_OVERRIDE; - virtual Accessible* FocusedChild() MOZ_OVERRIDE; - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE; - virtual bool NativelyUnavailable() const MOZ_OVERRIDE; - virtual void ApplyARIAState(uint64_t* aState) const MOZ_OVERRIDE; - virtual already_AddRefed Attributes() MOZ_OVERRIDE; + virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) override; + virtual void Description(nsString& aDescription) override; + virtual Accessible* FocusedChild() override; + virtual mozilla::a11y::role NativeRole() override; + virtual uint64_t NativeState() override; + virtual uint64_t NativeInteractiveState() const override; + virtual bool NativelyUnavailable() const override; + virtual void ApplyARIAState(uint64_t* aState) const override; + virtual already_AddRefed Attributes() override; - virtual void TakeFocus() MOZ_OVERRIDE; + virtual void TakeFocus() override; #ifdef A11Y_LOG - virtual nsresult HandleAccEvent(AccEvent* aEvent) MOZ_OVERRIDE; + virtual nsresult HandleAccEvent(AccEvent* aEvent) override; #endif - virtual nsRect RelativeBounds(nsIFrame** aRelativeFrame) const MOZ_OVERRIDE; + virtual nsRect RelativeBounds(nsIFrame** aRelativeFrame) const override; // HyperTextAccessible - virtual already_AddRefed GetEditor() const MOZ_OVERRIDE; + virtual already_AddRefed GetEditor() const override; // DocAccessible @@ -344,7 +344,7 @@ protected: void LastRelease(); // Accessible - virtual void CacheChildren() MOZ_OVERRIDE; + virtual void CacheChildren() override; // DocAccessible virtual nsresult AddEventListeners(); diff --git a/accessible/generic/FormControlAccessible.h b/accessible/generic/FormControlAccessible.h index 1953c5824e9f..59844e5530cf 100644 --- a/accessible/generic/FormControlAccessible.h +++ b/accessible/generic/FormControlAccessible.h @@ -28,19 +28,19 @@ public: } // Accessible - virtual void Value(nsString& aValue) MOZ_OVERRIDE; - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual void Value(nsString& aValue) override; + virtual mozilla::a11y::role NativeRole() override; + virtual uint64_t NativeState() override; // Value - virtual double MaxValue() const MOZ_OVERRIDE; - virtual double MinValue() const MOZ_OVERRIDE; - virtual double CurValue() const MOZ_OVERRIDE; - virtual double Step() const MOZ_OVERRIDE; - virtual bool SetCurValue(double aValue) MOZ_OVERRIDE; + virtual double MaxValue() const override; + virtual double MinValue() const override; + virtual double CurValue() const override; + virtual double Step() const override; + virtual bool SetCurValue(double aValue) override; // Widgets - virtual bool IsWidget() const MOZ_OVERRIDE; + virtual bool IsWidget() const override; protected: virtual ~ProgressMeterAccessible() {} @@ -56,17 +56,17 @@ public: RadioButtonAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; + virtual mozilla::a11y::role NativeRole() override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; enum { eAction_Click = 0 }; // Widgets - virtual bool IsWidget() const MOZ_OVERRIDE; + virtual bool IsWidget() const override; }; } // namespace a11y diff --git a/accessible/generic/HyperTextAccessible.h b/accessible/generic/HyperTextAccessible.h index 89d81e3df034..53a7aaee8f88 100644 --- a/accessible/generic/HyperTextAccessible.h +++ b/accessible/generic/HyperTextAccessible.h @@ -54,14 +54,14 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual nsIAtom* LandmarkRole() const MOZ_OVERRIDE; - virtual int32_t GetLevelInternal() MOZ_OVERRIDE; - virtual already_AddRefed NativeAttributes() MOZ_OVERRIDE; - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual nsIAtom* LandmarkRole() const override; + virtual int32_t GetLevelInternal() override; + virtual already_AddRefed NativeAttributes() override; + virtual mozilla::a11y::role NativeRole() override; + virtual uint64_t NativeState() override; - virtual void InvalidateChildren() MOZ_OVERRIDE; - virtual bool RemoveChild(Accessible* aAccessible) MOZ_OVERRIDE; + virtual void InvalidateChildren() override; + virtual bool RemoveChild(Accessible* aAccessible) override; // HyperTextAccessible (static helper method) @@ -432,8 +432,8 @@ protected: virtual ~HyperTextAccessible() { } // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; - virtual void CacheChildren() MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; + virtual void CacheChildren() override; // HyperTextAccessible diff --git a/accessible/generic/ImageAccessible.h b/accessible/generic/ImageAccessible.h index 5bbcb414904b..c63188237088 100644 --- a/accessible/generic/ImageAccessible.h +++ b/accessible/generic/ImageAccessible.h @@ -24,14 +24,14 @@ public: ImageAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual already_AddRefed NativeAttributes() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; + virtual already_AddRefed NativeAttributes() override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; // ImageAccessible nsIntPoint Position(uint32_t aCoordType); @@ -41,7 +41,7 @@ protected: virtual ~ImageAccessible(); // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; private: /** diff --git a/accessible/generic/OuterDocAccessible.h b/accessible/generic/OuterDocAccessible.h index 59f0ef9c4ee8..9b07f29f234d 100644 --- a/accessible/generic/OuterDocAccessible.h +++ b/accessible/generic/OuterDocAccessible.h @@ -20,7 +20,7 @@ namespace a11y { * the inner document root. */ -class OuterDocAccessible MOZ_FINAL : public AccessibleWrap +class OuterDocAccessible final : public AccessibleWrap { public: OuterDocAccessible(nsIContent* aContent, DocAccessible* aDoc); @@ -28,20 +28,20 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual void Shutdown() MOZ_OVERRIDE; - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; + virtual void Shutdown() override; + virtual mozilla::a11y::role NativeRole() override; virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY, - EWhichChildAtPoint aWhichChild) MOZ_OVERRIDE; + EWhichChildAtPoint aWhichChild) override; - virtual void InvalidateChildren() MOZ_OVERRIDE; - virtual bool InsertChildAt(uint32_t aIdx, Accessible* aChild) MOZ_OVERRIDE; - virtual bool RemoveChild(Accessible* aAccessible) MOZ_OVERRIDE; + virtual void InvalidateChildren() override; + virtual bool InsertChildAt(uint32_t aIdx, Accessible* aChild) override; + virtual bool RemoveChild(Accessible* aAccessible) override; protected: - virtual ~OuterDocAccessible() MOZ_OVERRIDE; + virtual ~OuterDocAccessible() override; // Accessible - virtual void CacheChildren() MOZ_OVERRIDE; + virtual void CacheChildren() override; }; } // namespace a11y diff --git a/accessible/generic/RootAccessible.h b/accessible/generic/RootAccessible.h index f02395b73020..b7785b407f71 100644 --- a/accessible/generic/RootAccessible.h +++ b/accessible/generic/RootAccessible.h @@ -26,14 +26,14 @@ public: nsIPresShell* aPresShell); // nsIDOMEventListener - NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) MOZ_OVERRIDE; + NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) override; // Accessible - virtual void Shutdown() MOZ_OVERRIDE; - virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE; - virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE; - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual void Shutdown() override; + virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) override; + virtual Relation RelationByType(RelationType aType) override; + virtual mozilla::a11y::role NativeRole() override; + virtual uint64_t NativeState() override; // RootAccessible @@ -48,8 +48,8 @@ protected: /** * Add/remove DOM event listeners. */ - virtual nsresult AddEventListeners() MOZ_OVERRIDE; - virtual nsresult RemoveEventListeners() MOZ_OVERRIDE; + virtual nsresult AddEventListeners() override; + virtual nsresult RemoveEventListeners() override; /** * Process the DOM event. diff --git a/accessible/generic/TextLeafAccessible.h b/accessible/generic/TextLeafAccessible.h index 630e68359c8b..9bb1f64866a1 100644 --- a/accessible/generic/TextLeafAccessible.h +++ b/accessible/generic/TextLeafAccessible.h @@ -21,10 +21,10 @@ public: virtual ~TextLeafAccessible(); // Accessible - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; + virtual mozilla::a11y::role NativeRole() override; virtual void AppendTextTo(nsAString& aText, uint32_t aStartOffset = 0, - uint32_t aLength = UINT32_MAX) MOZ_OVERRIDE; - virtual ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE; + uint32_t aLength = UINT32_MAX) override; + virtual ENameValueFlag Name(nsString& aName) override; // TextLeafAccessible void SetText(const nsAString& aText) { mText = aText; } @@ -32,7 +32,7 @@ public: protected: // Accessible - virtual void CacheChildren() MOZ_OVERRIDE; + virtual void CacheChildren() override; protected: nsString mText; diff --git a/accessible/html/HTMLCanvasAccessible.h b/accessible/html/HTMLCanvasAccessible.h index 6f3f701c05de..f07b84435de7 100644 --- a/accessible/html/HTMLCanvasAccessible.h +++ b/accessible/html/HTMLCanvasAccessible.h @@ -23,7 +23,7 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; protected: virtual ~HTMLCanvasAccessible() { } diff --git a/accessible/html/HTMLElementAccessibles.h b/accessible/html/HTMLElementAccessibles.h index 397d59c5e18f..8dfffd6f72d1 100644 --- a/accessible/html/HTMLElementAccessibles.h +++ b/accessible/html/HTMLElementAccessibles.h @@ -23,7 +23,7 @@ public: LeafAccessible(aContent, aDoc) {} // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; }; /** @@ -39,12 +39,12 @@ public: } // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; protected: // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; }; /** @@ -60,11 +60,11 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE; + virtual Relation RelationByType(RelationType aType) override; protected: virtual ~HTMLLabelAccessible() {} - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; }; /** @@ -80,7 +80,7 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE; + virtual Relation RelationByType(RelationType aType) override; protected: virtual ~HTMLOutputAccessible() {} diff --git a/accessible/html/HTMLFormControlAccessible.h b/accessible/html/HTMLFormControlAccessible.h index 8e5be8638226..c2f30d53a734 100644 --- a/accessible/html/HTMLFormControlAccessible.h +++ b/accessible/html/HTMLFormControlAccessible.h @@ -35,16 +35,16 @@ public: } // Accessible - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual mozilla::a11y::role NativeRole() override; + virtual uint64_t NativeState() override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; // Widgets - virtual bool IsWidget() const MOZ_OVERRIDE; + virtual bool IsWidget() const override; }; @@ -64,9 +64,9 @@ public: } // Accessible - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual uint64_t NativeState() override; virtual void GetPositionAndSizeInternal(int32_t *aPosInSet, - int32_t *aSetSize) MOZ_OVERRIDE; + int32_t *aSetSize) override; }; @@ -83,21 +83,21 @@ public: HTMLButtonAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t State() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual mozilla::a11y::role NativeRole() override; + virtual uint64_t State() override; + virtual uint64_t NativeState() override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; // Widgets - virtual bool IsWidget() const MOZ_OVERRIDE; + virtual bool IsWidget() const override; protected: // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; }; @@ -105,7 +105,7 @@ protected: * Accessible for HTML input@type="text", input@type="password", textarea and * other HTML text controls. */ -class HTMLTextFieldAccessible MOZ_FINAL : public HyperTextAccessibleWrap +class HTMLTextFieldAccessible final : public HyperTextAccessibleWrap { public: @@ -116,29 +116,29 @@ public: NS_DECL_ISUPPORTS_INHERITED // HyperTextAccessible - virtual already_AddRefed GetEditor() const MOZ_OVERRIDE; + virtual already_AddRefed GetEditor() const override; // Accessible - virtual void Value(nsString& aValue) MOZ_OVERRIDE; - virtual void ApplyARIAState(uint64_t* aState) const MOZ_OVERRIDE; - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual already_AddRefed NativeAttributes() MOZ_OVERRIDE; + virtual void Value(nsString& aValue) override; + virtual void ApplyARIAState(uint64_t* aState) const override; + virtual mozilla::a11y::role NativeRole() override; + virtual uint64_t NativeState() override; + virtual already_AddRefed NativeAttributes() override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; // Widgets - virtual bool IsWidget() const MOZ_OVERRIDE; - virtual Accessible* ContainerWidget() const MOZ_OVERRIDE; + virtual bool IsWidget() const override; + virtual Accessible* ContainerWidget() const override; protected: virtual ~HTMLTextFieldAccessible() {} // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; /** * Return a XUL widget element this input is part of. @@ -156,8 +156,8 @@ public: HTMLFileInputAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual nsresult HandleAccEvent(AccEvent* aAccEvent) MOZ_OVERRIDE; + virtual mozilla::a11y::role NativeRole() override; + virtual nsresult HandleAccEvent(AccEvent* aAccEvent) override; }; @@ -174,14 +174,14 @@ public: } // Accessible - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual void Value(nsString& aValue) MOZ_OVERRIDE; + virtual mozilla::a11y::role NativeRole() override; + virtual void Value(nsString& aValue) override; - virtual double MaxValue() const MOZ_OVERRIDE; - virtual double MinValue() const MOZ_OVERRIDE; - virtual double CurValue() const MOZ_OVERRIDE; - virtual double Step() const MOZ_OVERRIDE; - virtual bool SetCurValue(double aValue) MOZ_OVERRIDE; + virtual double MaxValue() const override; + virtual double MinValue() const override; + virtual double CurValue() const override; + virtual double Step() const override; + virtual bool SetCurValue(double aValue) override; }; @@ -198,18 +198,18 @@ public: } // Accessible - virtual void Value(nsString& aValue) MOZ_OVERRIDE; - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; + virtual void Value(nsString& aValue) override; + virtual mozilla::a11y::role NativeRole() override; // Value - virtual double MaxValue() const MOZ_OVERRIDE; - virtual double MinValue() const MOZ_OVERRIDE; - virtual double CurValue() const MOZ_OVERRIDE; - virtual double Step() const MOZ_OVERRIDE; - virtual bool SetCurValue(double aValue) MOZ_OVERRIDE; + virtual double MaxValue() const override; + virtual double MinValue() const override; + virtual double CurValue() const override; + virtual double Step() const override; + virtual bool SetCurValue(double aValue) override; // Widgets - virtual bool IsWidget() const MOZ_OVERRIDE; + virtual bool IsWidget() const override; }; @@ -222,12 +222,12 @@ public: HTMLGroupboxAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE; + virtual mozilla::a11y::role NativeRole() override; + virtual Relation RelationByType(RelationType aType) override; protected: // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; // HTMLGroupboxAccessible nsIContent* GetLegend() const; @@ -243,7 +243,7 @@ public: HTMLLegendAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE; + virtual Relation RelationByType(RelationType aType) override; }; /** @@ -255,11 +255,11 @@ public: HTMLFigureAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE; + virtual Relation RelationByType(RelationType aType) override; protected: // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; // HTMLLegendAccessible nsIContent* Caption() const; @@ -275,7 +275,7 @@ public: HTMLFigcaptionAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE; + virtual Relation RelationByType(RelationType aType) override; }; } // namespace a11y diff --git a/accessible/html/HTMLImageMapAccessible.h b/accessible/html/HTMLImageMapAccessible.h index 1b44e5eb9378..66593d2f41df 100644 --- a/accessible/html/HTMLImageMapAccessible.h +++ b/accessible/html/HTMLImageMapAccessible.h @@ -16,7 +16,7 @@ namespace a11y { /** * Used for HTML image maps. */ -class HTMLImageMapAccessible MOZ_FINAL : public ImageAccessibleWrap +class HTMLImageMapAccessible final : public ImageAccessibleWrap { public: HTMLImageMapAccessible(nsIContent* aContent, DocAccessible* aDoc); @@ -25,12 +25,12 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; // HyperLinkAccessible - virtual uint32_t AnchorCount() MOZ_OVERRIDE; - virtual Accessible* AnchorAt(uint32_t aAnchorIndex) MOZ_OVERRIDE; - virtual already_AddRefed AnchorURIAt(uint32_t aAnchorIndex) MOZ_OVERRIDE; + virtual uint32_t AnchorCount() override; + virtual Accessible* AnchorAt(uint32_t aAnchorIndex) override; + virtual already_AddRefed AnchorURIAt(uint32_t aAnchorIndex) override; /** * Update area children of the image map. @@ -46,32 +46,32 @@ protected: virtual ~HTMLImageMapAccessible() { } // Accessible - virtual void CacheChildren() MOZ_OVERRIDE; + virtual void CacheChildren() override; }; /** * Accessible for image map areas - must be child of image. */ -class HTMLAreaAccessible MOZ_FINAL : public HTMLLinkAccessible +class HTMLAreaAccessible final : public HTMLLinkAccessible { public: HTMLAreaAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual void Description(nsString& aDescription) MOZ_OVERRIDE; + virtual void Description(nsString& aDescription) override; virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY, - EWhichChildAtPoint aWhichChild) MOZ_OVERRIDE; - virtual nsRect RelativeBounds(nsIFrame** aBoundingFrame) const MOZ_OVERRIDE; + EWhichChildAtPoint aWhichChild) override; + virtual nsRect RelativeBounds(nsIFrame** aBoundingFrame) const override; // HyperLinkAccessible - virtual uint32_t StartOffset() MOZ_OVERRIDE; - virtual uint32_t EndOffset() MOZ_OVERRIDE; + virtual uint32_t StartOffset() override; + virtual uint32_t EndOffset() override; protected: // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; - virtual void CacheChildren() MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; + virtual void CacheChildren() override; }; diff --git a/accessible/html/HTMLLinkAccessible.h b/accessible/html/HTMLLinkAccessible.h index ec586a5ada08..aa4da22be58d 100644 --- a/accessible/html/HTMLLinkAccessible.h +++ b/accessible/html/HTMLLinkAccessible.h @@ -19,20 +19,20 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual void Value(nsString& aValue) MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual uint64_t NativeLinkState() const MOZ_OVERRIDE; - virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE; + virtual void Value(nsString& aValue) override; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; + virtual uint64_t NativeLinkState() const override; + virtual uint64_t NativeInteractiveState() const override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; // HyperLinkAccessible - virtual bool IsLink() MOZ_OVERRIDE; - virtual already_AddRefed AnchorURIAt(uint32_t aAnchorIndex) MOZ_OVERRIDE; + virtual bool IsLink() override; + virtual already_AddRefed AnchorURIAt(uint32_t aAnchorIndex) override; protected: virtual ~HTMLLinkAccessible() {} diff --git a/accessible/html/HTMLListAccessible.h b/accessible/html/HTMLListAccessible.h index 8d7bab725f3e..d804dd0c8114 100644 --- a/accessible/html/HTMLListAccessible.h +++ b/accessible/html/HTMLListAccessible.h @@ -28,8 +28,8 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; protected: virtual ~HTMLListAccessible() { } @@ -48,10 +48,10 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual void Shutdown() MOZ_OVERRIDE; - virtual nsIntRect Bounds() const MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual void Shutdown() override; + virtual nsIntRect Bounds() const override; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; // HTMLLIAccessible HTMLListBulletAccessible* Bullet() const { return mBullet; } @@ -61,7 +61,7 @@ protected: virtual ~HTMLLIAccessible() { } // Accessible - virtual void CacheChildren() MOZ_OVERRIDE; + virtual void CacheChildren() override; private: nsRefPtr mBullet; @@ -78,12 +78,12 @@ public: virtual ~HTMLListBulletAccessible() { } // Accessible - virtual nsIFrame* GetFrame() const MOZ_OVERRIDE; - virtual ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual nsIFrame* GetFrame() const override; + virtual ENameValueFlag Name(nsString& aName) override; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; virtual void AppendTextTo(nsAString& aText, uint32_t aStartOffset = 0, - uint32_t aLength = UINT32_MAX) MOZ_OVERRIDE; + uint32_t aLength = UINT32_MAX) override; // HTMLListBulletAccessible diff --git a/accessible/html/HTMLSelectAccessible.h b/accessible/html/HTMLSelectAccessible.h index 9c6a0d384264..2bdd6e1d9a00 100644 --- a/accessible/html/HTMLSelectAccessible.h +++ b/accessible/html/HTMLSelectAccessible.h @@ -39,24 +39,24 @@ public: virtual ~HTMLSelectListAccessible() {} // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; // SelectAccessible - virtual bool SelectAll() MOZ_OVERRIDE; - virtual bool UnselectAll() MOZ_OVERRIDE; + virtual bool SelectAll() override; + virtual bool UnselectAll() override; // Widgets - virtual bool IsWidget() const MOZ_OVERRIDE; - virtual bool IsActiveWidget() const MOZ_OVERRIDE; - virtual bool AreItemsOperable() const MOZ_OVERRIDE; - virtual Accessible* CurrentItem() MOZ_OVERRIDE; - virtual void SetCurrentItem(Accessible* aItem) MOZ_OVERRIDE; + virtual bool IsWidget() const override; + virtual bool IsActiveWidget() const override; + virtual bool AreItemsOperable() const override; + virtual Accessible* CurrentItem() override; + virtual void SetCurrentItem(Accessible* aItem) override; protected: // Accessible - virtual void CacheChildren() MOZ_OVERRIDE; + virtual void CacheChildren() override; }; /* @@ -71,25 +71,25 @@ public: virtual ~HTMLSelectOptionAccessible() {} // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; + virtual uint64_t NativeInteractiveState() const override; - virtual int32_t GetLevelInternal() MOZ_OVERRIDE; - virtual nsRect RelativeBounds(nsIFrame** aBoundingFrame) const MOZ_OVERRIDE; - virtual void SetSelected(bool aSelect) MOZ_OVERRIDE; + virtual int32_t GetLevelInternal() override; + virtual nsRect RelativeBounds(nsIFrame** aBoundingFrame) const override; + virtual void SetSelected(bool aSelect) override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; // Widgets - virtual Accessible* ContainerWidget() const MOZ_OVERRIDE; + virtual Accessible* ContainerWidget() const override; protected: // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; private: @@ -141,13 +141,13 @@ public: virtual ~HTMLSelectOptGroupAccessible() {} // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeInteractiveState() const override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; }; /** ------------------------------------------------------ */ @@ -159,7 +159,7 @@ class HTMLComboboxListAccessible; /* * A class the represents the HTML Combobox widget. */ -class HTMLComboboxAccessible MOZ_FINAL : public AccessibleWrap +class HTMLComboboxAccessible final : public AccessibleWrap { public: enum { eAction_Click = 0 }; @@ -168,29 +168,29 @@ public: virtual ~HTMLComboboxAccessible() {} // Accessible - virtual void Shutdown() MOZ_OVERRIDE; - virtual void Description(nsString& aDescription) MOZ_OVERRIDE; - virtual void Value(nsString& aValue) MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual void InvalidateChildren() MOZ_OVERRIDE; - virtual bool RemoveChild(Accessible* aChild) MOZ_OVERRIDE; + virtual void Shutdown() override; + virtual void Description(nsString& aDescription) override; + virtual void Value(nsString& aValue) override; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; + virtual void InvalidateChildren() override; + virtual bool RemoveChild(Accessible* aChild) override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; // Widgets - virtual bool IsWidget() const MOZ_OVERRIDE; - virtual bool IsActiveWidget() const MOZ_OVERRIDE; - virtual bool AreItemsOperable() const MOZ_OVERRIDE; - virtual Accessible* CurrentItem() MOZ_OVERRIDE; - virtual void SetCurrentItem(Accessible* aItem) MOZ_OVERRIDE; + virtual bool IsWidget() const override; + virtual bool IsActiveWidget() const override; + virtual bool AreItemsOperable() const override; + virtual Accessible* CurrentItem() override; + virtual void SetCurrentItem(Accessible* aItem) override; protected: // Accessible - virtual void CacheChildren() MOZ_OVERRIDE; + virtual void CacheChildren() override; /** * Return selected option. @@ -215,14 +215,14 @@ public: virtual ~HTMLComboboxListAccessible() {} // Accessible - virtual nsIFrame* GetFrame() const MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual nsRect RelativeBounds(nsIFrame** aBoundingFrame) const MOZ_OVERRIDE; + virtual nsIFrame* GetFrame() const override; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; + virtual nsRect RelativeBounds(nsIFrame** aBoundingFrame) const override; // Widgets - virtual bool IsActiveWidget() const MOZ_OVERRIDE; - virtual bool AreItemsOperable() const MOZ_OVERRIDE; + virtual bool IsActiveWidget() const override; + virtual bool AreItemsOperable() const override; }; } // namespace a11y diff --git a/accessible/html/HTMLTableAccessible.h b/accessible/html/HTMLTableAccessible.h index 5e6f66696b39..07ad6864a07c 100644 --- a/accessible/html/HTMLTableAccessible.h +++ b/accessible/html/HTMLTableAccessible.h @@ -29,21 +29,21 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual TableCellAccessible* AsTableCell() MOZ_OVERRIDE { return this; } - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE; - virtual already_AddRefed NativeAttributes() MOZ_OVERRIDE; + virtual TableCellAccessible* AsTableCell() override { return this; } + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; + virtual uint64_t NativeInteractiveState() const override; + virtual already_AddRefed NativeAttributes() override; // TableCellAccessible - virtual TableAccessible* Table() const MOZ_OVERRIDE; - virtual uint32_t ColIdx() const MOZ_OVERRIDE; - virtual uint32_t RowIdx() const MOZ_OVERRIDE; - virtual uint32_t ColExtent() const MOZ_OVERRIDE; - virtual uint32_t RowExtent() const MOZ_OVERRIDE; - virtual void ColHeaderCells(nsTArray* aCells) MOZ_OVERRIDE; - virtual void RowHeaderCells(nsTArray* aCells) MOZ_OVERRIDE; - virtual bool Selected() MOZ_OVERRIDE; + virtual TableAccessible* Table() const override; + virtual uint32_t ColIdx() const override; + virtual uint32_t RowIdx() const override; + virtual uint32_t ColExtent() const override; + virtual uint32_t RowExtent() const override; + virtual void ColHeaderCells(nsTArray* aCells) override; + virtual void RowHeaderCells(nsTArray* aCells) override; + virtual bool Selected() override; protected: virtual ~HTMLTableCellAccessible() {} @@ -69,7 +69,7 @@ public: HTMLTableHeaderCellAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; }; @@ -89,7 +89,7 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; protected: virtual ~HTMLTableRowAccessible() { } @@ -119,49 +119,49 @@ public: NS_DECL_ISUPPORTS_INHERITED // TableAccessible - virtual Accessible* Caption() const MOZ_OVERRIDE; - virtual void Summary(nsString& aSummary) MOZ_OVERRIDE; - virtual uint32_t ColCount() MOZ_OVERRIDE; - virtual uint32_t RowCount() MOZ_OVERRIDE; - virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex) MOZ_OVERRIDE; - virtual int32_t CellIndexAt(uint32_t aRowIdx, uint32_t aColIdx) MOZ_OVERRIDE; - virtual int32_t ColIndexAt(uint32_t aCellIdx) MOZ_OVERRIDE; - virtual int32_t RowIndexAt(uint32_t aCellIdx) MOZ_OVERRIDE; + virtual Accessible* Caption() const override; + virtual void Summary(nsString& aSummary) override; + virtual uint32_t ColCount() override; + virtual uint32_t RowCount() override; + virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex) override; + virtual int32_t CellIndexAt(uint32_t aRowIdx, uint32_t aColIdx) override; + virtual int32_t ColIndexAt(uint32_t aCellIdx) override; + virtual int32_t RowIndexAt(uint32_t aCellIdx) override; virtual void RowAndColIndicesAt(uint32_t aCellIdx, int32_t* aRowIdx, - int32_t* aColIdx) MOZ_OVERRIDE; - virtual uint32_t ColExtentAt(uint32_t aRowIdx, uint32_t aColIdx) MOZ_OVERRIDE; - virtual uint32_t RowExtentAt(uint32_t aRowIdx, uint32_t aColIdx) MOZ_OVERRIDE; - virtual bool IsColSelected(uint32_t aColIdx) MOZ_OVERRIDE; - virtual bool IsRowSelected(uint32_t aRowIdx) MOZ_OVERRIDE; - virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx) MOZ_OVERRIDE; - virtual uint32_t SelectedCellCount() MOZ_OVERRIDE; - virtual uint32_t SelectedColCount() MOZ_OVERRIDE; - virtual uint32_t SelectedRowCount() MOZ_OVERRIDE; - virtual void SelectedCells(nsTArray* aCells) MOZ_OVERRIDE; - virtual void SelectedCellIndices(nsTArray* aCells) MOZ_OVERRIDE; - virtual void SelectedColIndices(nsTArray* aCols) MOZ_OVERRIDE; - virtual void SelectedRowIndices(nsTArray* aRows) MOZ_OVERRIDE; - virtual void SelectCol(uint32_t aColIdx) MOZ_OVERRIDE; - virtual void SelectRow(uint32_t aRowIdx) MOZ_OVERRIDE; - virtual void UnselectCol(uint32_t aColIdx) MOZ_OVERRIDE; - virtual void UnselectRow(uint32_t aRowIdx) MOZ_OVERRIDE; - virtual bool IsProbablyLayoutTable() MOZ_OVERRIDE; - virtual Accessible* AsAccessible() MOZ_OVERRIDE { return this; } + int32_t* aColIdx) override; + virtual uint32_t ColExtentAt(uint32_t aRowIdx, uint32_t aColIdx) override; + virtual uint32_t RowExtentAt(uint32_t aRowIdx, uint32_t aColIdx) override; + virtual bool IsColSelected(uint32_t aColIdx) override; + virtual bool IsRowSelected(uint32_t aRowIdx) override; + virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx) override; + virtual uint32_t SelectedCellCount() override; + virtual uint32_t SelectedColCount() override; + virtual uint32_t SelectedRowCount() override; + virtual void SelectedCells(nsTArray* aCells) override; + virtual void SelectedCellIndices(nsTArray* aCells) override; + virtual void SelectedColIndices(nsTArray* aCols) override; + virtual void SelectedRowIndices(nsTArray* aRows) override; + virtual void SelectCol(uint32_t aColIdx) override; + virtual void SelectRow(uint32_t aRowIdx) override; + virtual void UnselectCol(uint32_t aColIdx) override; + virtual void UnselectRow(uint32_t aRowIdx) override; + virtual bool IsProbablyLayoutTable() override; + virtual Accessible* AsAccessible() override { return this; } // Accessible - virtual TableAccessible* AsTable() MOZ_OVERRIDE { return this; } - virtual void Description(nsString& aDescription) MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual already_AddRefed NativeAttributes() MOZ_OVERRIDE; - virtual Relation RelationByType(RelationType aRelationType) MOZ_OVERRIDE; + virtual TableAccessible* AsTable() override { return this; } + virtual void Description(nsString& aDescription) override; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; + virtual already_AddRefed NativeAttributes() override; + virtual Relation RelationByType(RelationType aRelationType) override; protected: virtual ~HTMLTableAccessible() {} // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; - virtual void CacheChildren() MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; + virtual void CacheChildren() override; // HTMLTableAccessible @@ -211,8 +211,8 @@ public: HyperTextAccessibleWrap(aContent, aDoc) { } // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual Relation RelationByType(RelationType aRelationType) MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; + virtual Relation RelationByType(RelationType aRelationType) override; protected: virtual ~HTMLCaptionAccessible() { } diff --git a/accessible/ipc/DocAccessibleChild.h b/accessible/ipc/DocAccessibleChild.h index b2fba29b8f34..981a800b1bbc 100644 --- a/accessible/ipc/DocAccessibleChild.h +++ b/accessible/ipc/DocAccessibleChild.h @@ -42,62 +42,62 @@ public: /* * Return the state for the accessible with given ID. */ - virtual bool RecvState(const uint64_t& aID, uint64_t* aState) MOZ_OVERRIDE; + virtual bool RecvState(const uint64_t& aID, uint64_t* aState) override; /* * Get the name for the accessible with given id. */ - virtual bool RecvName(const uint64_t& aID, nsString* aName) MOZ_OVERRIDE; + virtual bool RecvName(const uint64_t& aID, nsString* aName) override; - virtual bool RecvValue(const uint64_t& aID, nsString* aValue) MOZ_OVERRIDE; + virtual bool RecvValue(const uint64_t& aID, nsString* aValue) override; /* * Get the description for the accessible with given id. */ - virtual bool RecvDescription(const uint64_t& aID, nsString* aDesc) MOZ_OVERRIDE; + virtual bool RecvDescription(const uint64_t& aID, nsString* aDesc) override; virtual bool RecvRelationByType(const uint64_t& aID, const uint32_t& aType, - nsTArray* aTargets) MOZ_OVERRIDE; + nsTArray* aTargets) override; virtual bool RecvRelations(const uint64_t& aID, nsTArray* aRelations) - MOZ_OVERRIDE; + override; virtual bool RecvAttributes(const uint64_t& aID, - nsTArray *aAttributes) MOZ_OVERRIDE; + nsTArray *aAttributes) override; virtual bool RecvCaretOffset(const uint64_t& aID, int32_t* aOffset) - MOZ_OVERRIDE; + override; virtual bool RecvSetCaretOffset(const uint64_t& aID, const int32_t& aOffset, - bool* aValid) MOZ_OVERRIDE; + bool* aValid) override; virtual bool RecvCharacterCount(const uint64_t& aID, int32_t* aCount) - MOZ_OVERRIDE; + override; virtual bool RecvSelectionCount(const uint64_t& aID, int32_t* aCount) - MOZ_OVERRIDE; + override; virtual bool RecvTextSubstring(const uint64_t& aID, const int32_t& aStartOffset, const int32_t& aEndOffset, nsString* aText) - MOZ_OVERRIDE; + override; virtual bool RecvGetTextAfterOffset(const uint64_t& aID, const int32_t& aOffset, const int32_t& aBoundaryType, nsString* aText, int32_t* aStartOffset, - int32_t* aEndOffset) MOZ_OVERRIDE; + int32_t* aEndOffset) override; virtual bool RecvGetTextAtOffset(const uint64_t& aID, const int32_t& aOffset, const int32_t& aBoundaryType, nsString* aText, int32_t* aStartOffset, - int32_t* aEndOffset) MOZ_OVERRIDE; + int32_t* aEndOffset) override; virtual bool RecvGetTextBeforeOffset(const uint64_t& aID, const int32_t& aOffset, const int32_t& aBoundaryType, nsString* aText, int32_t* aStartOffset, - int32_t* aEndOffset) MOZ_OVERRIDE; + int32_t* aEndOffset) override; virtual bool RecvCharAt(const uint64_t& aID, const int32_t& aOffset, - uint16_t* aChar) MOZ_OVERRIDE; + uint16_t* aChar) override; virtual bool RecvTextAttributes(const uint64_t& aID, const bool& aIncludeDefAttrs, @@ -105,84 +105,84 @@ public: nsTArray* aAttributes, int32_t* aStartOffset, int32_t* aEndOffset) - MOZ_OVERRIDE; + override; virtual bool RecvDefaultTextAttributes(const uint64_t& aID, nsTArray* aAttributes) - MOZ_OVERRIDE; + override; virtual bool RecvTextBounds(const uint64_t& aID, const int32_t& aStartOffset, const int32_t& aEndOffset, const uint32_t& aCoordType, - nsIntRect* aRetVal) MOZ_OVERRIDE; + nsIntRect* aRetVal) override; virtual bool RecvCharBounds(const uint64_t& aID, const int32_t& aOffset, const uint32_t& aCoordType, - nsIntRect* aRetVal) MOZ_OVERRIDE; + nsIntRect* aRetVal) override; virtual bool RecvOffsetAtPoint(const uint64_t& aID, const int32_t& aX, const int32_t& aY, const uint32_t& aCoordType, - int32_t* aRetVal) MOZ_OVERRIDE; + int32_t* aRetVal) override; virtual bool RecvSelectionBoundsAt(const uint64_t& aID, const int32_t& aSelectionNum, bool* aSucceeded, nsString* aData, int32_t* aStartOffset, - int32_t* aEndOffset) MOZ_OVERRIDE; + int32_t* aEndOffset) override; virtual bool RecvSetSelectionBoundsAt(const uint64_t& aID, const int32_t& aSelectionNum, const int32_t& aStartOffset, const int32_t& aEndOffset, - bool* aSucceeded) MOZ_OVERRIDE; + bool* aSucceeded) override; virtual bool RecvAddToSelection(const uint64_t& aID, const int32_t& aStartOffset, const int32_t& aEndOffset, - bool* aSucceeded) MOZ_OVERRIDE; + bool* aSucceeded) override; virtual bool RecvRemoveFromSelection(const uint64_t& aID, const int32_t& aSelectionNum, - bool* aSucceeded) MOZ_OVERRIDE; + bool* aSucceeded) override; virtual bool RecvScrollSubstringTo(const uint64_t& aID, const int32_t& aStartOffset, const int32_t& aEndOffset, - const uint32_t& aScrollType) MOZ_OVERRIDE; + const uint32_t& aScrollType) override; virtual bool RecvScrollSubstringToPoint(const uint64_t& aID, const int32_t& aStartOffset, const int32_t& aEndOffset, const uint32_t& aCoordinateType, const int32_t& aX, - const int32_t& aY) MOZ_OVERRIDE; + const int32_t& aY) override; virtual bool RecvReplaceText(const uint64_t& aID, - const nsString& aText) MOZ_OVERRIDE; + const nsString& aText) override; virtual bool RecvInsertText(const uint64_t& aID, const nsString& aText, - const int32_t& aPosition) MOZ_OVERRIDE; + const int32_t& aPosition) override; virtual bool RecvCopyText(const uint64_t& aID, const int32_t& aStartPos, - const int32_t& aEndPos) MOZ_OVERRIDE; + const int32_t& aEndPos) override; virtual bool RecvCutText(const uint64_t& aID, const int32_t& aStartPos, - const int32_t& aEndPos) MOZ_OVERRIDE; + const int32_t& aEndPos) override; virtual bool RecvDeleteText(const uint64_t& aID, const int32_t& aStartPos, - const int32_t& aEndPos) MOZ_OVERRIDE; + const int32_t& aEndPos) override; virtual bool RecvPasteText(const uint64_t& aID, - const int32_t& aPosition) MOZ_OVERRIDE; + const int32_t& aPosition) override; private: bool PersistentPropertiesToArray(nsIPersistentProperties* aProps, diff --git a/accessible/ipc/DocAccessibleParent.h b/accessible/ipc/DocAccessibleParent.h index 8360004ad0bc..369dd5f49c64 100644 --- a/accessible/ipc/DocAccessibleParent.h +++ b/accessible/ipc/DocAccessibleParent.h @@ -40,13 +40,13 @@ public: * process it is firing an event. */ virtual bool RecvEvent(const uint64_t& aID, const uint32_t& aType) - MOZ_OVERRIDE; + override; - virtual bool RecvShowEvent(const ShowEventData& aData) MOZ_OVERRIDE; - virtual bool RecvHideEvent(const uint64_t& aRootID) MOZ_OVERRIDE; + virtual bool RecvShowEvent(const ShowEventData& aData) override; + virtual bool RecvHideEvent(const uint64_t& aRootID) override; void Destroy(); - virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE + virtual void ActorDestroy(ActorDestroyReason aWhy) override { if (!mShutdown) Destroy(); diff --git a/accessible/mac/AccessibleWrap.h b/accessible/mac/AccessibleWrap.h index 5eb0e5446075..7871947f7c71 100644 --- a/accessible/mac/AccessibleWrap.h +++ b/accessible/mac/AccessibleWrap.h @@ -36,7 +36,7 @@ public: // construction, destruction /** * Get the native Obj-C object (mozAccessible). */ - virtual void GetNativeInterface(void** aOutAccessible) MOZ_OVERRIDE; + virtual void GetNativeInterface(void** aOutAccessible) override; /** * The objective-c |Class| type that this accessible's native object @@ -45,13 +45,13 @@ public: // construction, destruction */ virtual Class GetNativeType (); - virtual void Shutdown () MOZ_OVERRIDE; - virtual void InvalidateChildren() MOZ_OVERRIDE; + virtual void Shutdown () override; + virtual void InvalidateChildren() override; - virtual bool InsertChildAt(uint32_t aIdx, Accessible* aChild) MOZ_OVERRIDE; - virtual bool RemoveChild(Accessible* aAccessible) MOZ_OVERRIDE; + virtual bool InsertChildAt(uint32_t aIdx, Accessible* aChild) override; + virtual bool RemoveChild(Accessible* aAccessible) override; - virtual nsresult HandleAccEvent(AccEvent* aEvent) MOZ_OVERRIDE; + virtual nsresult HandleAccEvent(AccEvent* aEvent) override; /** * Ignored means that the accessible might still have children, but is not diff --git a/accessible/windows/ia2/ia2AccessibleRelation.h b/accessible/windows/ia2/ia2AccessibleRelation.h index e5ab6d25be83..fd1df09103ee 100644 --- a/accessible/windows/ia2/ia2AccessibleRelation.h +++ b/accessible/windows/ia2/ia2AccessibleRelation.h @@ -19,7 +19,7 @@ namespace mozilla { namespace a11y { -class ia2AccessibleRelation MOZ_FINAL : public IAccessibleRelation +class ia2AccessibleRelation final : public IAccessibleRelation { public: ia2AccessibleRelation(RelationType aType, Relation* aRel); diff --git a/accessible/windows/msaa/ARIAGridAccessibleWrap.h b/accessible/windows/msaa/ARIAGridAccessibleWrap.h index 89c4add0053c..b03cc349f48b 100644 --- a/accessible/windows/msaa/ARIAGridAccessibleWrap.h +++ b/accessible/windows/msaa/ARIAGridAccessibleWrap.h @@ -34,7 +34,7 @@ public: // nsISupports NS_DECL_ISUPPORTS_INHERITED - virtual void Shutdown() MOZ_OVERRIDE; + virtual void Shutdown() override; }; /** @@ -56,7 +56,7 @@ public: // nsISupports NS_DECL_ISUPPORTS_INHERITED - virtual void Shutdown() MOZ_OVERRIDE; + virtual void Shutdown() override; }; } // namespace a11y diff --git a/accessible/windows/msaa/AccessibleWrap.cpp b/accessible/windows/msaa/AccessibleWrap.cpp index 253441a66765..099dd425c510 100644 --- a/accessible/windows/msaa/AccessibleWrap.cpp +++ b/accessible/windows/msaa/AccessibleWrap.cpp @@ -657,7 +657,7 @@ AccessibleWrap::get_accFocus( * This helper class implements IEnumVARIANT for a nsTArray containing * accessible objects. */ -class AccessibleEnumerator MOZ_FINAL : public IEnumVARIANT +class AccessibleEnumerator final : public IEnumVARIANT { public: AccessibleEnumerator(const nsTArray& aArray) : diff --git a/accessible/windows/msaa/AccessibleWrap.h b/accessible/windows/msaa/AccessibleWrap.h index bfe6a640df2b..b32ede032c22 100644 --- a/accessible/windows/msaa/AccessibleWrap.h +++ b/accessible/windows/msaa/AccessibleWrap.h @@ -171,7 +171,7 @@ public: // construction, destruction */ Accessible* GetXPAccessibleFor(const VARIANT& aVarChild); - virtual void GetNativeInterface(void **aOutAccessible) MOZ_OVERRIDE; + virtual void GetNativeInterface(void **aOutAccessible) override; static IDispatch* NativeAccessible(Accessible* aAccessible); diff --git a/accessible/windows/msaa/ApplicationAccessibleWrap.h b/accessible/windows/msaa/ApplicationAccessibleWrap.h index b608751f9e1a..a427e98f5347 100644 --- a/accessible/windows/msaa/ApplicationAccessibleWrap.h +++ b/accessible/windows/msaa/ApplicationAccessibleWrap.h @@ -25,7 +25,7 @@ public: NS_DECL_ISUPPORTS_INHERITED // nsAccessible - virtual already_AddRefed NativeAttributes() MOZ_OVERRIDE; + virtual already_AddRefed NativeAttributes() override; // IUnknown STDMETHODIMP QueryInterface(REFIID, void**); diff --git a/accessible/windows/msaa/EnumVariant.h b/accessible/windows/msaa/EnumVariant.h index e09ee0094801..14c6cc1b5bfe 100644 --- a/accessible/windows/msaa/EnumVariant.h +++ b/accessible/windows/msaa/EnumVariant.h @@ -16,7 +16,7 @@ namespace a11y { /** * Used to fetch accessible children. */ -class ChildrenEnumVariant MOZ_FINAL : public IEnumVARIANT +class ChildrenEnumVariant final : public IEnumVARIANT { public: ChildrenEnumVariant(AccessibleWrap* aAnchor) : mAnchorAcc(aAnchor), diff --git a/accessible/windows/msaa/HTMLTableAccessibleWrap.h b/accessible/windows/msaa/HTMLTableAccessibleWrap.h index 9e9ec0984711..71d149a3c22c 100644 --- a/accessible/windows/msaa/HTMLTableAccessibleWrap.h +++ b/accessible/windows/msaa/HTMLTableAccessibleWrap.h @@ -35,7 +35,7 @@ public: // nsISupports NS_DECL_ISUPPORTS_INHERITED - virtual void Shutdown() MOZ_OVERRIDE; + virtual void Shutdown() override; }; @@ -58,7 +58,7 @@ public: // nsISupports NS_DECL_ISUPPORTS_INHERITED - virtual void Shutdown() MOZ_OVERRIDE; + virtual void Shutdown() override; }; @@ -83,7 +83,7 @@ public: // nsISupports NS_DECL_ISUPPORTS_INHERITED - virtual void Shutdown() MOZ_OVERRIDE; + virtual void Shutdown() override; }; } // namespace a11y diff --git a/accessible/windows/msaa/HTMLWin32ObjectAccessible.h b/accessible/windows/msaa/HTMLWin32ObjectAccessible.h index 77ddaccb26d9..d4ec6880fe96 100644 --- a/accessible/windows/msaa/HTMLWin32ObjectAccessible.h +++ b/accessible/windows/msaa/HTMLWin32ObjectAccessible.h @@ -55,7 +55,7 @@ public: HTMLWin32ObjectAccessible(void* aHwnd, DocAccessible* aDoc); virtual ~HTMLWin32ObjectAccessible() {} - virtual void GetNativeInterface(void** aNativeAccessible) MOZ_OVERRIDE; + virtual void GetNativeInterface(void** aNativeAccessible) override; protected: void* mHwnd; diff --git a/accessible/windows/msaa/IUnknownImpl.h b/accessible/windows/msaa/IUnknownImpl.h index a265cdc9927e..cb2565776e35 100644 --- a/accessible/windows/msaa/IUnknownImpl.h +++ b/accessible/windows/msaa/IUnknownImpl.h @@ -51,13 +51,13 @@ private: #define DECL_IUNKNOWN \ public: \ virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID, void**); \ - virtual ULONG STDMETHODCALLTYPE AddRef() MOZ_FINAL \ + virtual ULONG STDMETHODCALLTYPE AddRef() final \ { \ MOZ_ASSERT(int32_t(mRefCnt) >= 0, "illegal refcnt"); \ ++mRefCnt; \ return mRefCnt; \ } \ - virtual ULONG STDMETHODCALLTYPE Release() MOZ_FINAL \ + virtual ULONG STDMETHODCALLTYPE Release() final \ { \ MOZ_ASSERT(int32_t(mRefCnt) > 0, "dup release"); \ --mRefCnt; \ diff --git a/accessible/windows/msaa/Platform.cpp b/accessible/windows/msaa/Platform.cpp index bce105511dcd..9e7e6cf6a3e9 100644 --- a/accessible/windows/msaa/Platform.cpp +++ b/accessible/windows/msaa/Platform.cpp @@ -45,7 +45,7 @@ class ProxyAccessibleWrap : public AccessibleWrap mBits.proxy = aProxy; } - virtual void Shutdown() MOZ_OVERRIDE + virtual void Shutdown() override { mBits.proxy = nullptr; } diff --git a/accessible/windows/msaa/ServiceProvider.h b/accessible/windows/msaa/ServiceProvider.h index 3fb99be180d6..9a91327d89a8 100644 --- a/accessible/windows/msaa/ServiceProvider.h +++ b/accessible/windows/msaa/ServiceProvider.h @@ -15,7 +15,7 @@ namespace mozilla { namespace a11y { -class ServiceProvider MOZ_FINAL : public IServiceProvider +class ServiceProvider final : public IServiceProvider { public: ServiceProvider(AccessibleWrap* aAcc) : mAccessible(aAcc) {} diff --git a/accessible/windows/msaa/XULListboxAccessibleWrap.h b/accessible/windows/msaa/XULListboxAccessibleWrap.h index a0e41c76c881..37db2d70a64a 100644 --- a/accessible/windows/msaa/XULListboxAccessibleWrap.h +++ b/accessible/windows/msaa/XULListboxAccessibleWrap.h @@ -33,7 +33,7 @@ public: // nsISupports NS_DECL_ISUPPORTS_INHERITED - virtual void Shutdown() MOZ_OVERRIDE; + virtual void Shutdown() override; }; /** @@ -55,7 +55,7 @@ public: // nsISupports NS_DECL_ISUPPORTS_INHERITED - virtual void Shutdown() MOZ_OVERRIDE; + virtual void Shutdown() override; }; } // namespace a11y diff --git a/accessible/windows/msaa/XULTreeGridAccessibleWrap.h b/accessible/windows/msaa/XULTreeGridAccessibleWrap.h index c224f141dc80..3c6c626998c1 100644 --- a/accessible/windows/msaa/XULTreeGridAccessibleWrap.h +++ b/accessible/windows/msaa/XULTreeGridAccessibleWrap.h @@ -34,7 +34,7 @@ public: // nsISupports NS_DECL_ISUPPORTS_INHERITED - virtual void Shutdown() MOZ_OVERRIDE; + virtual void Shutdown() override; }; /** @@ -62,7 +62,7 @@ public: // nsISupports NS_DECL_ISUPPORTS_INHERITED - virtual void Shutdown() MOZ_OVERRIDE; + virtual void Shutdown() override; }; } // namespace a11y diff --git a/accessible/windows/sdn/sdnAccessible.h b/accessible/windows/sdn/sdnAccessible.h index 7f2dbcf5d319..2876ad270089 100644 --- a/accessible/windows/sdn/sdnAccessible.h +++ b/accessible/windows/sdn/sdnAccessible.h @@ -16,7 +16,7 @@ namespace mozilla { namespace a11y { -class sdnAccessible MOZ_FINAL : public ISimpleDOMNode +class sdnAccessible final : public ISimpleDOMNode { public: sdnAccessible(nsINode* aNode) : diff --git a/accessible/windows/sdn/sdnDocAccessible.h b/accessible/windows/sdn/sdnDocAccessible.h index 4a8b1ccccff6..031aac8c0ce2 100644 --- a/accessible/windows/sdn/sdnDocAccessible.h +++ b/accessible/windows/sdn/sdnDocAccessible.h @@ -15,7 +15,7 @@ namespace mozilla { namespace a11y { -class sdnDocAccessible MOZ_FINAL : public ISimpleDOMDocument +class sdnDocAccessible final : public ISimpleDOMDocument { public: sdnDocAccessible(DocAccessibleWrap* aAccessible) : mAccessible(aAccessible) {}; diff --git a/accessible/windows/sdn/sdnTextAccessible.h b/accessible/windows/sdn/sdnTextAccessible.h index 416781d28298..5c44fcf6ce12 100644 --- a/accessible/windows/sdn/sdnTextAccessible.h +++ b/accessible/windows/sdn/sdnTextAccessible.h @@ -18,7 +18,7 @@ struct nsPoint; namespace mozilla { namespace a11y { -class sdnTextAccessible MOZ_FINAL : public ISimpleDOMText +class sdnTextAccessible final : public ISimpleDOMText { public: sdnTextAccessible(AccessibleWrap* aAccessible) : mAccessible(aAccessible) {}; diff --git a/accessible/windows/uia/uiaRawElmProvider.h b/accessible/windows/uia/uiaRawElmProvider.h index 7de60b7e2429..cb10779c1374 100644 --- a/accessible/windows/uia/uiaRawElmProvider.h +++ b/accessible/windows/uia/uiaRawElmProvider.h @@ -20,7 +20,7 @@ class AccessibleWrap; /** * IRawElementProviderSimple implementation (maintains IAccessibleEx approach). */ -class uiaRawElmProvider MOZ_FINAL : public IAccessibleEx, +class uiaRawElmProvider final : public IAccessibleEx, public IRawElementProviderSimple { public: diff --git a/accessible/xpcom/nsAccessibleRelation.h b/accessible/xpcom/nsAccessibleRelation.h index d8d17fc731c0..3495067d8f3e 100644 --- a/accessible/xpcom/nsAccessibleRelation.h +++ b/accessible/xpcom/nsAccessibleRelation.h @@ -20,7 +20,7 @@ class Relation; /** * Class represents an accessible relation. */ -class nsAccessibleRelation MOZ_FINAL : public nsIAccessibleRelation +class nsAccessibleRelation final : public nsIAccessibleRelation { public: nsAccessibleRelation(uint32_t aType, Relation* aRel); diff --git a/accessible/xpcom/xpcAccessible.h b/accessible/xpcom/xpcAccessible.h index f179bb058ec1..6f1132a6a893 100644 --- a/accessible/xpcom/xpcAccessible.h +++ b/accessible/xpcom/xpcAccessible.h @@ -24,68 +24,68 @@ class xpcAccessible : public nsIAccessible { public: // nsIAccessible - NS_IMETHOD GetParent(nsIAccessible** aParent) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetNextSibling(nsIAccessible** aNextSibling) MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD GetParent(nsIAccessible** aParent) final override; + NS_IMETHOD GetNextSibling(nsIAccessible** aNextSibling) final override; NS_IMETHOD GetPreviousSibling(nsIAccessible** aPreviousSibling) - MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetFirstChild(nsIAccessible** aFirstChild) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetLastChild(nsIAccessible** aLastChild) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetChildCount(int32_t* aChildCount) MOZ_FINAL MOZ_OVERRIDE; + final override; + NS_IMETHOD GetFirstChild(nsIAccessible** aFirstChild) final override; + NS_IMETHOD GetLastChild(nsIAccessible** aLastChild) final override; + NS_IMETHOD GetChildCount(int32_t* aChildCount) final override; NS_IMETHOD GetChildAt(int32_t aChildIndex, nsIAccessible** aChild) - MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetChildren(nsIArray** aChildren) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetIndexInParent(int32_t* aIndexInParent) MOZ_FINAL MOZ_OVERRIDE; + final override; + NS_IMETHOD GetChildren(nsIArray** aChildren) final override; + NS_IMETHOD GetIndexInParent(int32_t* aIndexInParent) final override; - NS_IMETHOD GetDOMNode(nsIDOMNode** aDOMNode) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetDocument(nsIAccessibleDocument** aDocument) MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD GetDOMNode(nsIDOMNode** aDOMNode) final override; + NS_IMETHOD GetDocument(nsIAccessibleDocument** aDocument) final override; NS_IMETHOD GetRootDocument(nsIAccessibleDocument** aRootDocument) - MOZ_FINAL MOZ_OVERRIDE; + final override; - NS_IMETHOD GetRole(uint32_t* aRole) MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD GetRole(uint32_t* aRole) final override; NS_IMETHOD GetState(uint32_t* aState, uint32_t* aExtraState) - MOZ_FINAL MOZ_OVERRIDE; + final override; - NS_IMETHOD GetDescription(nsAString& aDescription) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetName(nsAString& aName) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetLanguage(nsAString& aLanguage) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetValue(nsAString& aValue) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetHelp(nsAString& aHelp) MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD GetDescription(nsAString& aDescription) final override; + NS_IMETHOD GetName(nsAString& aName) final override; + NS_IMETHOD GetLanguage(nsAString& aLanguage) final override; + NS_IMETHOD GetValue(nsAString& aValue) final override; + NS_IMETHOD GetHelp(nsAString& aHelp) final override; - NS_IMETHOD GetAccessKey(nsAString& aAccessKey) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetKeyboardShortcut(nsAString& aKeyBinding) MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD GetAccessKey(nsAString& aAccessKey) final override; + NS_IMETHOD GetKeyboardShortcut(nsAString& aKeyBinding) final override; NS_IMETHOD GetAttributes(nsIPersistentProperties** aAttributes) - MOZ_FINAL MOZ_OVERRIDE; + final override; NS_IMETHOD GetBounds(int32_t* aX, int32_t* aY, - int32_t* aWidth, int32_t* aHeight) MOZ_FINAL MOZ_OVERRIDE; + int32_t* aWidth, int32_t* aHeight) final override; NS_IMETHOD GroupPosition(int32_t* aGroupLevel, int32_t* aSimilarItemsInGroup, - int32_t* aPositionInGroup) MOZ_FINAL MOZ_OVERRIDE; + int32_t* aPositionInGroup) final override; NS_IMETHOD GetRelationByType(uint32_t aType, nsIAccessibleRelation** aRelation) - MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetRelations(nsIArray** aRelations) MOZ_FINAL MOZ_OVERRIDE; + final override; + NS_IMETHOD GetRelations(nsIArray** aRelations) final override; - NS_IMETHOD GetFocusedChild(nsIAccessible** aChild) MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD GetFocusedChild(nsIAccessible** aChild) final override; NS_IMETHOD GetChildAtPoint(int32_t aX, int32_t aY, - nsIAccessible** aAccessible) MOZ_FINAL MOZ_OVERRIDE; + nsIAccessible** aAccessible) final override; NS_IMETHOD GetDeepestChildAtPoint(int32_t aX, int32_t aY, nsIAccessible** aAccessible) - MOZ_FINAL MOZ_OVERRIDE; + final override; - NS_IMETHOD SetSelected(bool aSelect) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD ExtendSelection() MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD TakeSelection() MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD TakeFocus() MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD SetSelected(bool aSelect) final override; + NS_IMETHOD ExtendSelection() final override; + NS_IMETHOD TakeSelection() final override; + NS_IMETHOD TakeFocus() final override; - NS_IMETHOD GetActionCount(uint8_t* aActionCount) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetActionName(uint8_t aIndex, nsAString& aName) MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD GetActionCount(uint8_t* aActionCount) final override; + NS_IMETHOD GetActionName(uint8_t aIndex, nsAString& aName) final override; NS_IMETHOD GetActionDescription(uint8_t aIndex, nsAString& aDescription) - MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD DoAction(uint8_t aIndex) MOZ_FINAL MOZ_OVERRIDE; + final override; + NS_IMETHOD DoAction(uint8_t aIndex) final override; - NS_IMETHOD ScrollTo(uint32_t aHow) MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD ScrollTo(uint32_t aHow) final override; NS_IMETHOD ScrollToPoint(uint32_t aCoordinateType, - int32_t aX, int32_t aY) MOZ_FINAL MOZ_OVERRIDE; + int32_t aX, int32_t aY) final override; protected: xpcAccessible() { } diff --git a/accessible/xpcom/xpcAccessibleApplication.h b/accessible/xpcom/xpcAccessibleApplication.h index a0c9ea458ee9..0acb2396261f 100644 --- a/accessible/xpcom/xpcAccessibleApplication.h +++ b/accessible/xpcom/xpcAccessibleApplication.h @@ -27,10 +27,10 @@ public: NS_DECL_ISUPPORTS_INHERITED // nsIAccessibleApplication - NS_IMETHOD GetAppName(nsAString& aName) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetAppVersion(nsAString& aVersion) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetPlatformName(nsAString& aName) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetPlatformVersion(nsAString& aVersion) MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD GetAppName(nsAString& aName) final override; + NS_IMETHOD GetAppVersion(nsAString& aVersion) final override; + NS_IMETHOD GetPlatformName(nsAString& aName) final override; + NS_IMETHOD GetPlatformVersion(nsAString& aVersion) final override; protected: virtual ~xpcAccessibleApplication() {} diff --git a/accessible/xpcom/xpcAccessibleDocument.h b/accessible/xpcom/xpcAccessibleDocument.h index 04f973b9b94c..a50d7dcbebf0 100644 --- a/accessible/xpcom/xpcAccessibleDocument.h +++ b/accessible/xpcom/xpcAccessibleDocument.h @@ -32,27 +32,27 @@ public: xpcAccessibleGeneric) // nsIAccessibleDocument - NS_IMETHOD GetURL(nsAString& aURL) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetTitle(nsAString& aTitle) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetMimeType(nsAString& aType) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetDocType(nsAString& aType) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetDOMDocument(nsIDOMDocument** aDOMDocument) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetWindow(nsIDOMWindow** aDOMWindow) MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD GetURL(nsAString& aURL) final override; + NS_IMETHOD GetTitle(nsAString& aTitle) final override; + NS_IMETHOD GetMimeType(nsAString& aType) final override; + NS_IMETHOD GetDocType(nsAString& aType) final override; + NS_IMETHOD GetDOMDocument(nsIDOMDocument** aDOMDocument) final override; + NS_IMETHOD GetWindow(nsIDOMWindow** aDOMWindow) final override; NS_IMETHOD GetParentDocument(nsIAccessibleDocument** aDocument) - MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetChildDocumentCount(uint32_t* aCount) MOZ_FINAL MOZ_OVERRIDE; + final override; + NS_IMETHOD GetChildDocumentCount(uint32_t* aCount) final override; NS_IMETHOD GetChildDocumentAt(uint32_t aIndex, nsIAccessibleDocument** aDocument) - MOZ_FINAL MOZ_OVERRIDE; + final override; NS_IMETHOD GetVirtualCursor(nsIAccessiblePivot** aVirtualCursor) - MOZ_FINAL MOZ_OVERRIDE; + final override; /** * Return XPCOM wrapper for the internal accessible. */ xpcAccessibleGeneric* GetAccessible(Accessible* aAccessible); - virtual void Shutdown() MOZ_OVERRIDE; + virtual void Shutdown() override; protected: virtual ~xpcAccessibleDocument() {} diff --git a/accessible/xpcom/xpcAccessibleGeneric.h b/accessible/xpcom/xpcAccessibleGeneric.h index dc466a13b6fb..05f408cabc9d 100644 --- a/accessible/xpcom/xpcAccessibleGeneric.h +++ b/accessible/xpcom/xpcAccessibleGeneric.h @@ -41,7 +41,7 @@ public: NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(xpcAccessibleGeneric, nsIAccessible) // nsIAccessible - virtual Accessible* ToInternalAccessible() const MOZ_FINAL MOZ_OVERRIDE; + virtual Accessible* ToInternalAccessible() const final override; // xpcAccessibleGeneric virtual void Shutdown(); diff --git a/accessible/xpcom/xpcAccessibleHyperLink.h b/accessible/xpcom/xpcAccessibleHyperLink.h index 0d71eb214f58..e17ca672af69 100644 --- a/accessible/xpcom/xpcAccessibleHyperLink.h +++ b/accessible/xpcom/xpcAccessibleHyperLink.h @@ -23,13 +23,13 @@ class Accessible; class xpcAccessibleHyperLink : public nsIAccessibleHyperLink { public: - NS_IMETHOD GetAnchorCount(int32_t* aAnchorCount) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetStartIndex(int32_t* aStartIndex) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetEndIndex(int32_t* aEndIndex) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetURI(int32_t aIndex, nsIURI** aURI) MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD GetAnchorCount(int32_t* aAnchorCount) final override; + NS_IMETHOD GetStartIndex(int32_t* aStartIndex) final override; + NS_IMETHOD GetEndIndex(int32_t* aEndIndex) final override; + NS_IMETHOD GetURI(int32_t aIndex, nsIURI** aURI) final override; NS_IMETHOD GetAnchor(int32_t aIndex, nsIAccessible** aAccessible) - MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetValid(bool* aValid) MOZ_FINAL MOZ_OVERRIDE; + final override; + NS_IMETHOD GetValid(bool* aValid) final override; protected: xpcAccessibleHyperLink() { } diff --git a/accessible/xpcom/xpcAccessibleImage.h b/accessible/xpcom/xpcAccessibleImage.h index 6ed751b66910..1e5bff78e8f0 100644 --- a/accessible/xpcom/xpcAccessibleImage.h +++ b/accessible/xpcom/xpcAccessibleImage.h @@ -24,8 +24,8 @@ public: NS_DECL_ISUPPORTS_INHERITED NS_IMETHOD GetImagePosition(uint32_t aCoordType, - int32_t* aX, int32_t* aY) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetImageSize(int32_t* aWidth, int32_t* aHeight) MOZ_FINAL MOZ_OVERRIDE; + int32_t* aX, int32_t* aY) final override; + NS_IMETHOD GetImageSize(int32_t* aWidth, int32_t* aHeight) final override; protected: virtual ~xpcAccessibleImage() {} diff --git a/accessible/xpcom/xpcAccessibleSelectable.h b/accessible/xpcom/xpcAccessibleSelectable.h index a87bb4c146dd..7b2f8a827643 100644 --- a/accessible/xpcom/xpcAccessibleSelectable.h +++ b/accessible/xpcom/xpcAccessibleSelectable.h @@ -25,17 +25,17 @@ class xpcAccessibleSelectable : public nsIAccessibleSelectable { public: // nsIAccessibleSelectable - NS_IMETHOD GetSelectedItems(nsIArray** aSelectedItems) MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD GetSelectedItems(nsIArray** aSelectedItems) final override; NS_IMETHOD GetSelectedItemCount(uint32_t* aSelectedItemCount) - MOZ_FINAL MOZ_OVERRIDE; + final override; NS_IMETHOD GetSelectedItemAt(uint32_t aIndex, nsIAccessible** aItem) - MOZ_FINAL MOZ_OVERRIDE; + final override; NS_IMETHOD IsItemSelected(uint32_t aIndex, bool* aIsSelected) - MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD AddItemToSelection(uint32_t aIndex) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD RemoveItemFromSelection(uint32_t aIndex) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD SelectAll(bool* aIsMultiSelect) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD UnselectAll() MOZ_FINAL MOZ_OVERRIDE; + final override; + NS_IMETHOD AddItemToSelection(uint32_t aIndex) final override; + NS_IMETHOD RemoveItemFromSelection(uint32_t aIndex) final override; + NS_IMETHOD SelectAll(bool* aIsMultiSelect) final override; + NS_IMETHOD UnselectAll() final override; protected: xpcAccessibleSelectable() { } diff --git a/accessible/xpcom/xpcAccessibleTable.h b/accessible/xpcom/xpcAccessibleTable.h index 2e835badf809..40b611e59f61 100644 --- a/accessible/xpcom/xpcAccessibleTable.h +++ b/accessible/xpcom/xpcAccessibleTable.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ MOZ_FINAL; tab-width: 2 MOZ_FINAL; indent-tabs-mode: nil MOZ_FINAL; c-basic-offset: 2 -*- */ +/* -*- Mode: C++ final; tab-width: 2 final; indent-tabs-mode: nil final; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, @@ -26,55 +26,55 @@ public: NS_DECL_ISUPPORTS_INHERITED // nsIAccessibleTable - NS_IMETHOD GetCaption(nsIAccessible** aCaption) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetSummary(nsAString& aSummary) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetColumnCount(int32_t* aColumnCount) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetRowCount(int32_t* aRowCount) MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD GetCaption(nsIAccessible** aCaption) final override; + NS_IMETHOD GetSummary(nsAString& aSummary) final override; + NS_IMETHOD GetColumnCount(int32_t* aColumnCount) final override; + NS_IMETHOD GetRowCount(int32_t* aRowCount) final override; NS_IMETHOD GetCellAt(int32_t aRowIndex, int32_t aColumnIndex, - nsIAccessible** aCell) MOZ_FINAL MOZ_OVERRIDE; + nsIAccessible** aCell) final override; NS_IMETHOD GetCellIndexAt(int32_t aRowIndex, int32_t aColumnIndex, - int32_t* aCellIndex) MOZ_FINAL MOZ_OVERRIDE; + int32_t* aCellIndex) final override; NS_IMETHOD GetColumnIndexAt(int32_t aCellIndex, int32_t* aColumnIndex) - MOZ_FINAL MOZ_OVERRIDE; + final override; NS_IMETHOD GetRowIndexAt(int32_t aCellIndex, int32_t* aRowIndex) - MOZ_FINAL MOZ_OVERRIDE; + final override; NS_IMETHOD GetRowAndColumnIndicesAt(int32_t aCellIndex, int32_t* aRowIndex, int32_t* aColumnIndex) - MOZ_FINAL MOZ_OVERRIDE; + final override; NS_IMETHOD GetColumnExtentAt(int32_t row, int32_t column, - int32_t* aColumnExtent) MOZ_FINAL MOZ_OVERRIDE; + int32_t* aColumnExtent) final override; NS_IMETHOD GetRowExtentAt(int32_t row, int32_t column, - int32_t* aRowExtent) MOZ_FINAL MOZ_OVERRIDE; + int32_t* aRowExtent) final override; NS_IMETHOD GetColumnDescription(int32_t aColIdx, nsAString& aDescription) - MOZ_FINAL MOZ_OVERRIDE; + final override; NS_IMETHOD GetRowDescription(int32_t aRowIdx, nsAString& aDescription) - MOZ_FINAL MOZ_OVERRIDE; + final override; NS_IMETHOD IsColumnSelected(int32_t aColIdx, bool* _retval) - MOZ_FINAL MOZ_OVERRIDE; + final override; NS_IMETHOD IsRowSelected(int32_t aRowIdx, bool* _retval) - MOZ_FINAL MOZ_OVERRIDE; + final override; NS_IMETHOD IsCellSelected(int32_t aRowIdx, int32_t aColIdx, bool* _retval) - MOZ_FINAL MOZ_OVERRIDE; + final override; NS_IMETHOD GetSelectedCellCount(uint32_t* aSelectedCellCount) - MOZ_FINAL MOZ_OVERRIDE; + final override; NS_IMETHOD GetSelectedColumnCount(uint32_t* aSelectedColumnCount) - MOZ_FINAL MOZ_OVERRIDE; + final override; NS_IMETHOD GetSelectedRowCount(uint32_t* aSelectedRowCount) - MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetSelectedCells(nsIArray** aSelectedCell) MOZ_FINAL MOZ_OVERRIDE; + final override; + NS_IMETHOD GetSelectedCells(nsIArray** aSelectedCell) final override; NS_IMETHOD GetSelectedCellIndices(uint32_t* aCellsArraySize, int32_t** aCellsArray) - MOZ_FINAL MOZ_OVERRIDE; + final override; NS_IMETHOD GetSelectedColumnIndices(uint32_t* aColsArraySize, int32_t** aColsArray) - MOZ_FINAL MOZ_OVERRIDE; + final override; NS_IMETHOD GetSelectedRowIndices(uint32_t* aRowsArraySize, - int32_t** aRowsArray) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD SelectColumn(int32_t aColIdx) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD SelectRow(int32_t aRowIdx) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD UnselectColumn(int32_t aColIdx) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD UnselectRow(int32_t aRowIdx) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD IsProbablyForLayout(bool* aIsForLayout) MOZ_FINAL MOZ_OVERRIDE; + int32_t** aRowsArray) final override; + NS_IMETHOD SelectColumn(int32_t aColIdx) final override; + NS_IMETHOD SelectRow(int32_t aRowIdx) final override; + NS_IMETHOD UnselectColumn(int32_t aColIdx) final override; + NS_IMETHOD UnselectRow(int32_t aRowIdx) final override; + NS_IMETHOD IsProbablyForLayout(bool* aIsForLayout) final override; protected: virtual ~xpcAccessibleTable() {} diff --git a/accessible/xpcom/xpcAccessibleTableCell.h b/accessible/xpcom/xpcAccessibleTableCell.h index 4f99a83ee04f..d6f3a1418696 100644 --- a/accessible/xpcom/xpcAccessibleTableCell.h +++ b/accessible/xpcom/xpcAccessibleTableCell.h @@ -27,14 +27,14 @@ public: NS_DECL_ISUPPORTS_INHERITED // nsIAccessibleTableCell - NS_IMETHOD GetTable(nsIAccessibleTable** aTable) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetColumnIndex(int32_t* aColIdx) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetRowIndex(int32_t* aRowIdx) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetColumnExtent(int32_t* aExtent) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetRowExtent(int32_t* aExtent) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetColumnHeaderCells(nsIArray** aHeaderCells) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetRowHeaderCells(nsIArray** aHeaderCells) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD IsSelected(bool* aSelected) MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD GetTable(nsIAccessibleTable** aTable) final override; + NS_IMETHOD GetColumnIndex(int32_t* aColIdx) final override; + NS_IMETHOD GetRowIndex(int32_t* aRowIdx) final override; + NS_IMETHOD GetColumnExtent(int32_t* aExtent) final override; + NS_IMETHOD GetRowExtent(int32_t* aExtent) final override; + NS_IMETHOD GetColumnHeaderCells(nsIArray** aHeaderCells) final override; + NS_IMETHOD GetRowHeaderCells(nsIArray** aHeaderCells) final override; + NS_IMETHOD IsSelected(bool* aSelected) final override; protected: virtual ~xpcAccessibleTableCell() {} diff --git a/accessible/xpcom/xpcAccessibleTextRange.h b/accessible/xpcom/xpcAccessibleTextRange.h index 91c704d29ba4..6d1cd74b2ba9 100644 --- a/accessible/xpcom/xpcAccessibleTextRange.h +++ b/accessible/xpcom/xpcAccessibleTextRange.h @@ -26,37 +26,37 @@ class TextRange; { 0xbb, 0x62, 0x6d, 0x5b, 0xf1, 0xef, 0x91, 0x0c } \ } -class xpcAccessibleTextRange MOZ_FINAL : public nsIAccessibleTextRange +class xpcAccessibleTextRange final : public nsIAccessibleTextRange { public: NS_DECL_CYCLE_COLLECTING_ISUPPORTS NS_DECL_CYCLE_COLLECTION_CLASS(xpcAccessibleTextRange) - NS_IMETHOD GetStartContainer(nsIAccessibleText** aAnchor) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetStartOffset(int32_t* aOffset) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetEndContainer(nsIAccessibleText** aAnchor) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetEndOffset(int32_t* aOffset) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetContainer(nsIAccessible** aContainer) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetEmbeddedChildren(nsIArray** aList) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD Compare(nsIAccessibleTextRange* aOtherRange, bool* aResult) MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD GetStartContainer(nsIAccessibleText** aAnchor) final override; + NS_IMETHOD GetStartOffset(int32_t* aOffset) final override; + NS_IMETHOD GetEndContainer(nsIAccessibleText** aAnchor) final override; + NS_IMETHOD GetEndOffset(int32_t* aOffset) final override; + NS_IMETHOD GetContainer(nsIAccessible** aContainer) final override; + NS_IMETHOD GetEmbeddedChildren(nsIArray** aList) final override; + NS_IMETHOD Compare(nsIAccessibleTextRange* aOtherRange, bool* aResult) final override; NS_IMETHOD CompareEndPoints(uint32_t aEndPoint, nsIAccessibleTextRange* aOtherRange, uint32_t aOtherRangeEndPoint, - int32_t* aResult) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetText(nsAString& aText) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetBounds(nsIArray** aRectList) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD Move(uint32_t aUnit, int32_t aCount) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD MoveStart(uint32_t aUnit, int32_t aCount) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD MoveEnd(uint32_t aUnit, int32_t aCount) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD Normalize(uint32_t aUnit) MOZ_FINAL MOZ_OVERRIDE; + int32_t* aResult) final override; + NS_IMETHOD GetText(nsAString& aText) final override; + NS_IMETHOD GetBounds(nsIArray** aRectList) final override; + NS_IMETHOD Move(uint32_t aUnit, int32_t aCount) final override; + NS_IMETHOD MoveStart(uint32_t aUnit, int32_t aCount) final override; + NS_IMETHOD MoveEnd(uint32_t aUnit, int32_t aCount) final override; + NS_IMETHOD Normalize(uint32_t aUnit) final override; NS_IMETHOD FindText(const nsAString& aText, bool aIsBackward, bool aIsIgnoreCase, - nsIAccessibleTextRange** aRange) MOZ_FINAL MOZ_OVERRIDE; + nsIAccessibleTextRange** aRange) final override; NS_IMETHOD FindAttr(uint32_t aAttr, nsIVariant* aVal, bool aIsBackward, - nsIAccessibleTextRange** aRange) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD AddToSelection() MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD RemoveFromSelection() MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD Select() MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD ScrollIntoView(uint32_t aHow) MOZ_FINAL MOZ_OVERRIDE; + nsIAccessibleTextRange** aRange) final override; + NS_IMETHOD AddToSelection() final override; + NS_IMETHOD RemoveFromSelection() final override; + NS_IMETHOD Select() final override; + NS_IMETHOD ScrollIntoView(uint32_t aHow) final override; NS_DECLARE_STATIC_IID_ACCESSOR(NS_ACCESSIBLETEXTRANGE_IMPL_IID) diff --git a/accessible/xpcom/xpcAccessibleValue.h b/accessible/xpcom/xpcAccessibleValue.h index 70a861da7808..4e213156a07a 100644 --- a/accessible/xpcom/xpcAccessibleValue.h +++ b/accessible/xpcom/xpcAccessibleValue.h @@ -21,11 +21,11 @@ class Accessible; class xpcAccessibleValue : public nsIAccessibleValue { public: - NS_IMETHOD GetMaximumValue(double* aValue) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetMinimumValue(double* aValue) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetCurrentValue(double* aValue) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD SetCurrentValue(double aValue) MOZ_FINAL MOZ_OVERRIDE; - NS_IMETHOD GetMinimumIncrement(double* aMinIncrement) MOZ_FINAL MOZ_OVERRIDE; + NS_IMETHOD GetMaximumValue(double* aValue) final override; + NS_IMETHOD GetMinimumValue(double* aValue) final override; + NS_IMETHOD GetCurrentValue(double* aValue) final override; + NS_IMETHOD SetCurrentValue(double aValue) final override; + NS_IMETHOD GetMinimumIncrement(double* aMinIncrement) final override; protected: xpcAccessibleValue() { } diff --git a/accessible/xul/XULAlertAccessible.h b/accessible/xul/XULAlertAccessible.h index ec21fc1f5c86..62bf4cb46400 100644 --- a/accessible/xul/XULAlertAccessible.h +++ b/accessible/xul/XULAlertAccessible.h @@ -23,13 +23,13 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) override; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; // Widgets - virtual bool IsWidget() const MOZ_OVERRIDE; - virtual Accessible* ContainerWidget() const MOZ_OVERRIDE; + virtual bool IsWidget() const override; + virtual Accessible* ContainerWidget() const override; protected: ~XULAlertAccessible(); diff --git a/accessible/xul/XULColorPickerAccessible.h b/accessible/xul/XULColorPickerAccessible.h index 259ec530134f..0b74c1b69041 100644 --- a/accessible/xul/XULColorPickerAccessible.h +++ b/accessible/xul/XULColorPickerAccessible.h @@ -21,13 +21,13 @@ public: DocAccessible* aDoc); // Accessible - virtual void Value(nsString& aValue) MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE; + virtual void Value(nsString& aValue) override; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; + virtual uint64_t NativeInteractiveState() const override; // Widgets - virtual Accessible* ContainerWidget() const MOZ_OVERRIDE; + virtual Accessible* ContainerWidget() const override; }; @@ -40,15 +40,15 @@ public: XULColorPickerAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; // Widgets - virtual bool IsWidget() const MOZ_OVERRIDE; - virtual bool IsActiveWidget() const MOZ_OVERRIDE; - virtual bool AreItemsOperable() const MOZ_OVERRIDE; + virtual bool IsWidget() const override; + virtual bool IsActiveWidget() const override; + virtual bool AreItemsOperable() const override; - virtual bool IsAcceptableChild(Accessible* aPossibleChild) const MOZ_OVERRIDE; + virtual bool IsAcceptableChild(Accessible* aPossibleChild) const override; }; } // namespace a11y diff --git a/accessible/xul/XULComboboxAccessible.h b/accessible/xul/XULComboboxAccessible.h index 56ddd3cb0220..ae8398a521aa 100644 --- a/accessible/xul/XULComboboxAccessible.h +++ b/accessible/xul/XULComboboxAccessible.h @@ -22,20 +22,20 @@ public: XULComboboxAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual void Description(nsString& aDescription) MOZ_OVERRIDE; - virtual void Value(nsString& aValue) MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual bool CanHaveAnonChildren() MOZ_OVERRIDE; + virtual void Description(nsString& aDescription) override; + virtual void Value(nsString& aValue) override; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; + virtual bool CanHaveAnonChildren() override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; // Widgets - virtual bool IsActiveWidget() const MOZ_OVERRIDE; - virtual bool AreItemsOperable() const MOZ_OVERRIDE; + virtual bool IsActiveWidget() const override; + virtual bool AreItemsOperable() const override; }; } // namespace a11y diff --git a/accessible/xul/XULElementAccessibles.h b/accessible/xul/XULElementAccessibles.h index 7b104c0c2e79..8267f2a43610 100644 --- a/accessible/xul/XULElementAccessibles.h +++ b/accessible/xul/XULElementAccessibles.h @@ -23,17 +23,17 @@ public: XULLabelAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual void Shutdown() MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE; + virtual void Shutdown() override; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; + virtual Relation RelationByType(RelationType aType) override; void UpdateLabelValue(const nsString& aValue); protected: // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; - virtual void CacheChildren() MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; + virtual void CacheChildren() override; private: nsRefPtr mValueTextLeaf; @@ -50,7 +50,7 @@ Accessible::AsXULLabel() * Used to implement text interface on XUL label accessible in case when text * is provided by @value attribute (no underlying text frame). */ -class XULLabelTextLeafAccessible MOZ_FINAL : public TextLeafAccessibleWrap +class XULLabelTextLeafAccessible final : public TextLeafAccessibleWrap { public: XULLabelTextLeafAccessible(nsIContent* aContent, DocAccessible* aDoc) : @@ -60,8 +60,8 @@ public: virtual ~XULLabelTextLeafAccessible() { } // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; }; @@ -75,8 +75,8 @@ public: XULTooltipAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; }; class XULLinkAccessible : public XULLabelAccessible @@ -86,26 +86,26 @@ public: XULLinkAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual void Value(nsString& aValue) MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeLinkState() const MOZ_OVERRIDE; + virtual void Value(nsString& aValue) override; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeLinkState() const override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; // HyperLinkAccessible - virtual bool IsLink() MOZ_OVERRIDE; - virtual uint32_t StartOffset() MOZ_OVERRIDE; - virtual uint32_t EndOffset() MOZ_OVERRIDE; - virtual already_AddRefed AnchorURIAt(uint32_t aAnchorIndex) MOZ_OVERRIDE; + virtual bool IsLink() override; + virtual uint32_t StartOffset() override; + virtual uint32_t EndOffset() override; + virtual already_AddRefed AnchorURIAt(uint32_t aAnchorIndex) override; protected: virtual ~XULLinkAccessible(); // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; enum { eAction_Jump = 0 }; diff --git a/accessible/xul/XULFormControlAccessible.h b/accessible/xul/XULFormControlAccessible.h index 7c4856b43adc..0ed8d0080a87 100644 --- a/accessible/xul/XULFormControlAccessible.h +++ b/accessible/xul/XULFormControlAccessible.h @@ -36,21 +36,21 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual mozilla::a11y::role NativeRole() override; + virtual uint64_t NativeState() override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; // Widgets - virtual bool IsWidget() const MOZ_OVERRIDE; - virtual bool IsActiveWidget() const MOZ_OVERRIDE; - virtual bool AreItemsOperable() const MOZ_OVERRIDE; - virtual Accessible* ContainerWidget() const MOZ_OVERRIDE; + virtual bool IsWidget() const override; + virtual bool IsActiveWidget() const override; + virtual bool AreItemsOperable() const override; + virtual Accessible* ContainerWidget() const override; - virtual bool IsAcceptableChild(Accessible* aPossibleChild) const MOZ_OVERRIDE; + virtual bool IsAcceptableChild(Accessible* aPossibleChild) const override; protected: virtual ~XULButtonAccessible(); @@ -70,13 +70,13 @@ public: XULCheckboxAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual mozilla::a11y::role NativeRole() override; + virtual uint64_t NativeState() override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; }; /** @@ -89,13 +89,13 @@ public: XULDropmarkerAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual mozilla::a11y::role NativeRole() override; + virtual uint64_t NativeState() override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; private: bool DropmarkerOpen(bool aToggleOpen) const; @@ -104,18 +104,18 @@ private: /** * Used for XUL groupbox element. */ -class XULGroupboxAccessible MOZ_FINAL : public AccessibleWrap +class XULGroupboxAccessible final : public AccessibleWrap { public: XULGroupboxAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE; + virtual mozilla::a11y::role NativeRole() override; + virtual Relation RelationByType(RelationType aType) override; protected: // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; }; /** @@ -128,11 +128,11 @@ public: XULRadioButtonAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE; + virtual uint64_t NativeState() override; + virtual uint64_t NativeInteractiveState() const override; // Widgets - virtual Accessible* ContainerWidget() const MOZ_OVERRIDE; + virtual Accessible* ContainerWidget() const override; }; /** @@ -144,13 +144,13 @@ public: XULRadioGroupAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE; + virtual mozilla::a11y::role NativeRole() override; + virtual uint64_t NativeInteractiveState() const override; // Widgets - virtual bool IsWidget() const MOZ_OVERRIDE; - virtual bool IsActiveWidget() const MOZ_OVERRIDE; - virtual bool AreItemsOperable() const MOZ_OVERRIDE; + virtual bool IsWidget() const override; + virtual bool IsActiveWidget() const override; + virtual bool AreItemsOperable() const override; }; /** @@ -162,7 +162,7 @@ public: XULStatusBarAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; + virtual mozilla::a11y::role NativeRole() override; }; /** @@ -175,7 +175,7 @@ public: // Accessible virtual void GetPositionAndSizeInternal(int32_t* aPosInSet, - int32_t* aSetSize) MOZ_OVERRIDE; + int32_t* aSetSize) override; // nsXULToolbarButtonAccessible static bool IsSeparator(Accessible* aAccessible); @@ -190,11 +190,11 @@ public: XULToolbarAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; + virtual mozilla::a11y::role NativeRole() override; protected: // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; }; /** @@ -207,8 +207,8 @@ public: DocAccessible* aDoc); // Accessible - virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual mozilla::a11y::role NativeRole() override; + virtual uint64_t NativeState() override; }; } // namespace a11y diff --git a/accessible/xul/XULListboxAccessible.h b/accessible/xul/XULListboxAccessible.h index e3e5ba8bb9df..42e2d39616eb 100644 --- a/accessible/xul/XULListboxAccessible.h +++ b/accessible/xul/XULListboxAccessible.h @@ -29,8 +29,8 @@ public: XULColumAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; }; /** @@ -43,13 +43,13 @@ public: XULColumnItemAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; enum { eAction_Click = 0 }; }; @@ -64,35 +64,35 @@ public: XULListboxAccessible(nsIContent* aContent, DocAccessible* aDoc); // TableAccessible - virtual uint32_t ColCount() MOZ_OVERRIDE; - virtual uint32_t RowCount() MOZ_OVERRIDE; - virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex) MOZ_OVERRIDE; - virtual bool IsColSelected(uint32_t aColIdx) MOZ_OVERRIDE; - virtual bool IsRowSelected(uint32_t aRowIdx) MOZ_OVERRIDE; - virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx) MOZ_OVERRIDE; - virtual uint32_t SelectedCellCount() MOZ_OVERRIDE; - virtual uint32_t SelectedColCount() MOZ_OVERRIDE; - virtual uint32_t SelectedRowCount() MOZ_OVERRIDE; - virtual void SelectedCells(nsTArray* aCells) MOZ_OVERRIDE; - virtual void SelectedCellIndices(nsTArray* aCells) MOZ_OVERRIDE; - virtual void SelectedColIndices(nsTArray* aCols) MOZ_OVERRIDE; - virtual void SelectedRowIndices(nsTArray* aRows) MOZ_OVERRIDE; - virtual void SelectRow(uint32_t aRowIdx) MOZ_OVERRIDE; - virtual void UnselectRow(uint32_t aRowIdx) MOZ_OVERRIDE; - virtual Accessible* AsAccessible() MOZ_OVERRIDE { return this; } + virtual uint32_t ColCount() override; + virtual uint32_t RowCount() override; + virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex) override; + virtual bool IsColSelected(uint32_t aColIdx) override; + virtual bool IsRowSelected(uint32_t aRowIdx) override; + virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx) override; + virtual uint32_t SelectedCellCount() override; + virtual uint32_t SelectedColCount() override; + virtual uint32_t SelectedRowCount() override; + virtual void SelectedCells(nsTArray* aCells) override; + virtual void SelectedCellIndices(nsTArray* aCells) override; + virtual void SelectedColIndices(nsTArray* aCols) override; + virtual void SelectedRowIndices(nsTArray* aRows) override; + virtual void SelectRow(uint32_t aRowIdx) override; + virtual void UnselectRow(uint32_t aRowIdx) override; + virtual Accessible* AsAccessible() override { return this; } // Accessible - virtual void Value(nsString& aValue) MOZ_OVERRIDE; - virtual TableAccessible* AsTable() MOZ_OVERRIDE { return this; } - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual void Value(nsString& aValue) override; + virtual TableAccessible* AsTable() override { return this; } + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; // Widgets - virtual bool IsWidget() const MOZ_OVERRIDE; - virtual bool IsActiveWidget() const MOZ_OVERRIDE; - virtual bool AreItemsOperable() const MOZ_OVERRIDE; + virtual bool IsWidget() const override; + virtual bool IsActiveWidget() const override; + virtual bool AreItemsOperable() const override; - virtual Accessible* ContainerWidget() const MOZ_OVERRIDE; + virtual Accessible* ContainerWidget() const override; protected: virtual ~XULListboxAccessible() {} @@ -113,23 +113,23 @@ public: XULListitemAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual void Description(nsString& aDesc) MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE; - virtual bool CanHaveAnonChildren() MOZ_OVERRIDE; + virtual void Description(nsString& aDesc) override; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; + virtual uint64_t NativeInteractiveState() const override; + virtual bool CanHaveAnonChildren() override; // Actions - virtual void ActionNameAt(uint8_t index, nsAString& aName) MOZ_OVERRIDE; + virtual void ActionNameAt(uint8_t index, nsAString& aName) override; // Widgets - virtual Accessible* ContainerWidget() const MOZ_OVERRIDE; + virtual Accessible* ContainerWidget() const override; protected: virtual ~XULListitemAccessible(); // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; // XULListitemAccessible @@ -155,16 +155,16 @@ public: NS_DECL_ISUPPORTS_INHERITED // Accessible - virtual TableCellAccessible* AsTableCell() MOZ_OVERRIDE { return this; } - virtual already_AddRefed NativeAttributes() MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; + virtual TableCellAccessible* AsTableCell() override { return this; } + virtual already_AddRefed NativeAttributes() override; + virtual a11y::role NativeRole() override; // TableCellAccessible - virtual TableAccessible* Table() const MOZ_OVERRIDE; - virtual uint32_t ColIdx() const MOZ_OVERRIDE; - virtual uint32_t RowIdx() const MOZ_OVERRIDE; - virtual void ColHeaderCells(nsTArray* aHeaderCells) MOZ_OVERRIDE; - virtual bool Selected() MOZ_OVERRIDE; + virtual TableAccessible* Table() const override; + virtual uint32_t ColIdx() const override; + virtual uint32_t RowIdx() const override; + virtual void ColHeaderCells(nsTArray* aHeaderCells) override; + virtual bool Selected() override; protected: virtual ~XULListCellAccessible() {} diff --git a/accessible/xul/XULMenuAccessible.h b/accessible/xul/XULMenuAccessible.h index 6b06bbbe8d91..3fa66620e78a 100644 --- a/accessible/xul/XULMenuAccessible.h +++ b/accessible/xul/XULMenuAccessible.h @@ -24,29 +24,29 @@ public: XULMenuitemAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual void Description(nsString& aDescription) MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE; - virtual int32_t GetLevelInternal() MOZ_OVERRIDE; + virtual void Description(nsString& aDescription) override; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; + virtual uint64_t NativeInteractiveState() const override; + virtual int32_t GetLevelInternal() override; - virtual bool CanHaveAnonChildren() MOZ_OVERRIDE; + virtual bool CanHaveAnonChildren() override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; - virtual KeyBinding AccessKey() const MOZ_OVERRIDE; - virtual KeyBinding KeyboardShortcut() const MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; + virtual KeyBinding AccessKey() const override; + virtual KeyBinding KeyboardShortcut() const override; // Widgets - virtual bool IsActiveWidget() const MOZ_OVERRIDE; - virtual bool AreItemsOperable() const MOZ_OVERRIDE; - virtual Accessible* ContainerWidget() const MOZ_OVERRIDE; + virtual bool IsActiveWidget() const override; + virtual bool AreItemsOperable() const override; + virtual Accessible* ContainerWidget() const override; protected: // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; }; /** @@ -58,17 +58,17 @@ public: XULMenuSeparatorAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; protected: // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; }; @@ -81,19 +81,19 @@ public: XULMenupopupAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; // Widgets - virtual bool IsWidget() const MOZ_OVERRIDE; - virtual bool IsActiveWidget() const MOZ_OVERRIDE; - virtual bool AreItemsOperable() const MOZ_OVERRIDE; + virtual bool IsWidget() const override; + virtual bool IsActiveWidget() const override; + virtual bool AreItemsOperable() const override; - virtual Accessible* ContainerWidget() const MOZ_OVERRIDE; + virtual Accessible* ContainerWidget() const override; protected: // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; }; /** @@ -105,17 +105,17 @@ public: XULMenubarAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; // Widget - virtual bool IsActiveWidget() const MOZ_OVERRIDE; - virtual bool AreItemsOperable() const MOZ_OVERRIDE; - virtual Accessible* CurrentItem() MOZ_OVERRIDE; - virtual void SetCurrentItem(Accessible* aItem) MOZ_OVERRIDE; + virtual bool IsActiveWidget() const override; + virtual bool AreItemsOperable() const override; + virtual Accessible* CurrentItem() override; + virtual void SetCurrentItem(Accessible* aItem) override; protected: // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; }; } // namespace a11y diff --git a/accessible/xul/XULSelectControlAccessible.h b/accessible/xul/XULSelectControlAccessible.h index a72bfe9c23d6..c4886e26e4cf 100644 --- a/accessible/xul/XULSelectControlAccessible.h +++ b/accessible/xul/XULSelectControlAccessible.h @@ -23,21 +23,21 @@ public: virtual ~XULSelectControlAccessible() {} // Accessible - virtual void Shutdown() MOZ_OVERRIDE; + virtual void Shutdown() override; // SelectAccessible - virtual void SelectedItems(nsTArray* aItems) MOZ_OVERRIDE; - virtual uint32_t SelectedItemCount() MOZ_OVERRIDE; - virtual Accessible* GetSelectedItem(uint32_t aIndex) MOZ_OVERRIDE; - virtual bool IsItemSelected(uint32_t aIndex) MOZ_OVERRIDE; - virtual bool AddItemToSelection(uint32_t aIndex) MOZ_OVERRIDE; - virtual bool RemoveItemFromSelection(uint32_t aIndex) MOZ_OVERRIDE; - virtual bool SelectAll() MOZ_OVERRIDE; - virtual bool UnselectAll() MOZ_OVERRIDE; + virtual void SelectedItems(nsTArray* aItems) override; + virtual uint32_t SelectedItemCount() override; + virtual Accessible* GetSelectedItem(uint32_t aIndex) override; + virtual bool IsItemSelected(uint32_t aIndex) override; + virtual bool AddItemToSelection(uint32_t aIndex) override; + virtual bool RemoveItemFromSelection(uint32_t aIndex) override; + virtual bool SelectAll() override; + virtual bool UnselectAll() override; // Widgets - virtual Accessible* CurrentItem() MOZ_OVERRIDE; - virtual void SetCurrentItem(Accessible* aItem) MOZ_OVERRIDE; + virtual Accessible* CurrentItem() override; + virtual void SetCurrentItem(Accessible* aItem) override; protected: // nsIDOMXULMultiSelectControlElement inherits from this, so we'll always have diff --git a/accessible/xul/XULSliderAccessible.h b/accessible/xul/XULSliderAccessible.h index 300e271804d8..264f78c8c91d 100644 --- a/accessible/xul/XULSliderAccessible.h +++ b/accessible/xul/XULSliderAccessible.h @@ -22,23 +22,23 @@ public: XULSliderAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual void Value(nsString& aValue) MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE; - virtual bool NativelyUnavailable() const MOZ_OVERRIDE; - virtual bool CanHaveAnonChildren() MOZ_OVERRIDE; + virtual void Value(nsString& aValue) override; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeInteractiveState() const override; + virtual bool NativelyUnavailable() const override; + virtual bool CanHaveAnonChildren() override; // Value - virtual double MaxValue() const MOZ_OVERRIDE; - virtual double MinValue() const MOZ_OVERRIDE; - virtual double CurValue() const MOZ_OVERRIDE; - virtual double Step() const MOZ_OVERRIDE; - virtual bool SetCurValue(double aValue) MOZ_OVERRIDE; + virtual double MaxValue() const override; + virtual double MinValue() const override; + virtual double CurValue() const override; + virtual double Step() const override; + virtual bool SetCurValue(double aValue) override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; protected: /** @@ -66,7 +66,7 @@ public: XULThumbAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; }; } // namespace a11y diff --git a/accessible/xul/XULTabAccessible.h b/accessible/xul/XULTabAccessible.h index 5fa8e22ea20a..0c10c067943e 100644 --- a/accessible/xul/XULTabAccessible.h +++ b/accessible/xul/XULTabAccessible.h @@ -24,15 +24,15 @@ public: XULTabAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE; - virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; + virtual uint64_t NativeInteractiveState() const override; + virtual Relation RelationByType(RelationType aType) override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; }; @@ -45,15 +45,15 @@ public: XULTabsAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual void Value(nsString& aValue) MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; + virtual void Value(nsString& aValue) override; + virtual a11y::role NativeRole() override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; protected: // Accessible - virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE; + virtual ENameValueFlag NativeName(nsString& aName) override; }; @@ -68,7 +68,7 @@ public: { mType = eXULTabpanelsType; } // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; }; @@ -85,8 +85,8 @@ public: XULTabpanelAccessible(nsIContent* aContent, DocAccessible* aDoc); // Accessible - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE; + virtual a11y::role NativeRole() override; + virtual Relation RelationByType(RelationType aType) override; }; } // namespace a11y diff --git a/accessible/xul/XULTreeAccessible.h b/accessible/xul/XULTreeAccessible.h index 8969fc993dcd..ba8c39cf9ec3 100644 --- a/accessible/xul/XULTreeAccessible.h +++ b/accessible/xul/XULTreeAccessible.h @@ -39,35 +39,35 @@ public: NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(XULTreeAccessible, Accessible) // Accessible - virtual void Shutdown() MOZ_OVERRIDE; - virtual void Value(nsString& aValue) MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; + virtual void Shutdown() override; + virtual void Value(nsString& aValue) override; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY, - EWhichChildAtPoint aWhichChild) MOZ_OVERRIDE; + EWhichChildAtPoint aWhichChild) override; - virtual Accessible* GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE; - virtual uint32_t ChildCount() const MOZ_OVERRIDE; - virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE; + virtual Accessible* GetChildAt(uint32_t aIndex) const override; + virtual uint32_t ChildCount() const override; + virtual Relation RelationByType(RelationType aType) override; // SelectAccessible - virtual void SelectedItems(nsTArray* aItems) MOZ_OVERRIDE; - virtual uint32_t SelectedItemCount() MOZ_OVERRIDE; - virtual Accessible* GetSelectedItem(uint32_t aIndex) MOZ_OVERRIDE; - virtual bool IsItemSelected(uint32_t aIndex) MOZ_OVERRIDE; - virtual bool AddItemToSelection(uint32_t aIndex) MOZ_OVERRIDE; - virtual bool RemoveItemFromSelection(uint32_t aIndex) MOZ_OVERRIDE; - virtual bool SelectAll() MOZ_OVERRIDE; - virtual bool UnselectAll() MOZ_OVERRIDE; + virtual void SelectedItems(nsTArray* aItems) override; + virtual uint32_t SelectedItemCount() override; + virtual Accessible* GetSelectedItem(uint32_t aIndex) override; + virtual bool IsItemSelected(uint32_t aIndex) override; + virtual bool AddItemToSelection(uint32_t aIndex) override; + virtual bool RemoveItemFromSelection(uint32_t aIndex) override; + virtual bool SelectAll() override; + virtual bool UnselectAll() override; // Widgets - virtual bool IsWidget() const MOZ_OVERRIDE; - virtual bool IsActiveWidget() const MOZ_OVERRIDE; - virtual bool AreItemsOperable() const MOZ_OVERRIDE; - virtual Accessible* CurrentItem() MOZ_OVERRIDE; - virtual void SetCurrentItem(Accessible* aItem) MOZ_OVERRIDE; + virtual bool IsWidget() const override; + virtual bool IsActiveWidget() const override; + virtual bool AreItemsOperable() const override; + virtual Accessible* CurrentItem() override; + virtual void SetCurrentItem(Accessible* aItem) override; - virtual Accessible* ContainerWidget() const MOZ_OVERRIDE; + virtual Accessible* ContainerWidget() const override; // XULTreeAccessible @@ -145,24 +145,24 @@ public: AccessibleWrap) // Accessible - virtual void Shutdown() MOZ_OVERRIDE; - virtual nsIntRect Bounds() const MOZ_OVERRIDE; - virtual GroupPos GroupPosition() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE; - virtual int32_t IndexInParent() const MOZ_OVERRIDE; - virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE; - virtual Accessible* FocusedChild() MOZ_OVERRIDE; - virtual void SetSelected(bool aSelect) MOZ_OVERRIDE; - virtual void TakeFocus() MOZ_OVERRIDE; + virtual void Shutdown() override; + virtual nsIntRect Bounds() const override; + virtual GroupPos GroupPosition() override; + virtual uint64_t NativeState() override; + virtual uint64_t NativeInteractiveState() const override; + virtual int32_t IndexInParent() const override; + virtual Relation RelationByType(RelationType aType) override; + virtual Accessible* FocusedChild() override; + virtual void SetSelected(bool aSelect) override; + virtual void TakeFocus() override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; // Widgets - virtual Accessible* ContainerWidget() const MOZ_OVERRIDE; + virtual Accessible* ContainerWidget() const override; // XULTreeItemAccessibleBase NS_DECLARE_STATIC_IID_ACCESSOR(XULTREEITEMBASEACCESSIBLE_IMPL_CID) @@ -190,9 +190,9 @@ protected: enum { eAction_Click = 0, eAction_Expand = 1 }; // Accessible - virtual void DispatchClickEvent(nsIContent *aContent, uint32_t aActionIndex) MOZ_OVERRIDE; + virtual void DispatchClickEvent(nsIContent *aContent, uint32_t aActionIndex) override; virtual Accessible* GetSiblingAtOffset(int32_t aOffset, - nsresult *aError = nullptr) const MOZ_OVERRIDE; + nsresult *aError = nullptr) const override; // XULTreeItemAccessibleBase @@ -231,18 +231,18 @@ public: XULTreeItemAccessibleBase) // Accessible - virtual void Shutdown() MOZ_OVERRIDE; - virtual ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; + virtual void Shutdown() override; + virtual ENameValueFlag Name(nsString& aName) override; + virtual a11y::role NativeRole() override; // XULTreeItemAccessibleBase - virtual void RowInvalidated(int32_t aStartColIdx, int32_t aEndColIdx) MOZ_OVERRIDE; + virtual void RowInvalidated(int32_t aStartColIdx, int32_t aEndColIdx) override; protected: virtual ~XULTreeItemAccessible(); // Accessible - virtual void CacheChildren() MOZ_OVERRIDE; + virtual void CacheChildren() override; // XULTreeItemAccessible nsCOMPtr mColumn; @@ -263,7 +263,7 @@ protected: // Accessible virtual Accessible* GetSiblingAtOffset(int32_t aOffset, nsresult* aError = nullptr) const - MOZ_OVERRIDE; + override; }; diff --git a/accessible/xul/XULTreeGridAccessible.h b/accessible/xul/XULTreeGridAccessible.h index 1ae5c6c2a7c1..5ba4e5f1e1fb 100644 --- a/accessible/xul/XULTreeGridAccessible.h +++ b/accessible/xul/XULTreeGridAccessible.h @@ -30,34 +30,34 @@ public: { mGenericTypes |= eTable; } // TableAccessible - virtual uint32_t ColCount() MOZ_OVERRIDE; - virtual uint32_t RowCount() MOZ_OVERRIDE; - virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex) MOZ_OVERRIDE; - virtual void ColDescription(uint32_t aColIdx, nsString& aDescription) MOZ_OVERRIDE; - virtual bool IsColSelected(uint32_t aColIdx) MOZ_OVERRIDE; - virtual bool IsRowSelected(uint32_t aRowIdx) MOZ_OVERRIDE; - virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx) MOZ_OVERRIDE; - virtual uint32_t SelectedCellCount() MOZ_OVERRIDE; - virtual uint32_t SelectedColCount() MOZ_OVERRIDE; - virtual uint32_t SelectedRowCount() MOZ_OVERRIDE; - virtual void SelectedCells(nsTArray* aCells) MOZ_OVERRIDE; - virtual void SelectedCellIndices(nsTArray* aCells) MOZ_OVERRIDE; - virtual void SelectedColIndices(nsTArray* aCols) MOZ_OVERRIDE; - virtual void SelectedRowIndices(nsTArray* aRows) MOZ_OVERRIDE; - virtual void SelectRow(uint32_t aRowIdx) MOZ_OVERRIDE; - virtual void UnselectRow(uint32_t aRowIdx) MOZ_OVERRIDE; - virtual Accessible* AsAccessible() MOZ_OVERRIDE { return this; } + virtual uint32_t ColCount() override; + virtual uint32_t RowCount() override; + virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex) override; + virtual void ColDescription(uint32_t aColIdx, nsString& aDescription) override; + virtual bool IsColSelected(uint32_t aColIdx) override; + virtual bool IsRowSelected(uint32_t aRowIdx) override; + virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx) override; + virtual uint32_t SelectedCellCount() override; + virtual uint32_t SelectedColCount() override; + virtual uint32_t SelectedRowCount() override; + virtual void SelectedCells(nsTArray* aCells) override; + virtual void SelectedCellIndices(nsTArray* aCells) override; + virtual void SelectedColIndices(nsTArray* aCols) override; + virtual void SelectedRowIndices(nsTArray* aRows) override; + virtual void SelectRow(uint32_t aRowIdx) override; + virtual void UnselectRow(uint32_t aRowIdx) override; + virtual Accessible* AsAccessible() override { return this; } // Accessible - virtual TableAccessible* AsTable() MOZ_OVERRIDE { return this; } - virtual a11y::role NativeRole() MOZ_OVERRIDE; + virtual TableAccessible* AsTable() override { return this; } + virtual a11y::role NativeRole() override; protected: virtual ~XULTreeGridAccessible(); // XULTreeAccessible virtual already_AddRefed - CreateTreeItemAccessible(int32_t aRow) const MOZ_OVERRIDE; + CreateTreeItemAccessible(int32_t aRow) const override; }; @@ -65,7 +65,7 @@ protected: * Represents accessible for XUL tree item in the case when XUL tree has * multiple columns. */ -class XULTreeGridRowAccessible MOZ_FINAL : public XULTreeItemAccessibleBase +class XULTreeGridRowAccessible final : public XULTreeItemAccessibleBase { public: using Accessible::GetChildAt; @@ -80,25 +80,25 @@ public: XULTreeItemAccessibleBase) // Accessible - virtual void Shutdown() MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE; + virtual void Shutdown() override; + virtual a11y::role NativeRole() override; + virtual ENameValueFlag Name(nsString& aName) override; virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY, - EWhichChildAtPoint aWhichChild) MOZ_OVERRIDE; + EWhichChildAtPoint aWhichChild) override; - virtual Accessible* GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE; - virtual uint32_t ChildCount() const MOZ_OVERRIDE; + virtual Accessible* GetChildAt(uint32_t aIndex) const override; + virtual uint32_t ChildCount() const override; // XULTreeItemAccessibleBase virtual XULTreeGridCellAccessible* GetCellAccessible(nsITreeColumn* aColumn) - const MOZ_OVERRIDE MOZ_FINAL; - virtual void RowInvalidated(int32_t aStartColIdx, int32_t aEndColIdx) MOZ_OVERRIDE; + const override final; + virtual void RowInvalidated(int32_t aStartColIdx, int32_t aEndColIdx) override; protected: virtual ~XULTreeGridRowAccessible(); // Accessible - virtual void CacheChildren() MOZ_OVERRIDE; + virtual void CacheChildren() override; // XULTreeItemAccessibleBase mutable nsRefPtrHashtable, XULTreeGridCellAccessible> @@ -127,29 +127,29 @@ public: LeafAccessible) // Accessible - virtual TableCellAccessible* AsTableCell() MOZ_OVERRIDE { return this; } - virtual nsIntRect Bounds() const MOZ_OVERRIDE; - virtual ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE; - virtual Accessible* FocusedChild() MOZ_OVERRIDE; - virtual already_AddRefed NativeAttributes() MOZ_OVERRIDE; - virtual int32_t IndexInParent() const MOZ_OVERRIDE; - virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE; - virtual a11y::role NativeRole() MOZ_OVERRIDE; - virtual uint64_t NativeState() MOZ_OVERRIDE; - virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE; + virtual TableCellAccessible* AsTableCell() override { return this; } + virtual nsIntRect Bounds() const override; + virtual ENameValueFlag Name(nsString& aName) override; + virtual Accessible* FocusedChild() override; + virtual already_AddRefed NativeAttributes() override; + virtual int32_t IndexInParent() const override; + virtual Relation RelationByType(RelationType aType) override; + virtual a11y::role NativeRole() override; + virtual uint64_t NativeState() override; + virtual uint64_t NativeInteractiveState() const override; // ActionAccessible - virtual uint8_t ActionCount() MOZ_OVERRIDE; - virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE; - virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE; + virtual uint8_t ActionCount() override; + virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override; + virtual bool DoAction(uint8_t aIndex) override; // TableCellAccessible - virtual TableAccessible* Table() const MOZ_OVERRIDE; - virtual uint32_t ColIdx() const MOZ_OVERRIDE; - virtual uint32_t RowIdx() const MOZ_OVERRIDE; - virtual void ColHeaderCells(nsTArray* aHeaderCells) MOZ_OVERRIDE; - virtual void RowHeaderCells(nsTArray* aCells) MOZ_OVERRIDE { } - virtual bool Selected() MOZ_OVERRIDE; + virtual TableAccessible* Table() const override; + virtual uint32_t ColIdx() const override; + virtual uint32_t RowIdx() const override; + virtual void ColHeaderCells(nsTArray* aHeaderCells) override; + virtual void RowHeaderCells(nsTArray* aCells) override { } + virtual bool Selected() override; /** * Fire name or state change event if the accessible text or value has been @@ -163,8 +163,8 @@ protected: // Accessible virtual Accessible* GetSiblingAtOffset(int32_t aOffset, - nsresult* aError = nullptr) const MOZ_OVERRIDE; - virtual void DispatchClickEvent(nsIContent* aContent, uint32_t aActionIndex) MOZ_OVERRIDE; + nsresult* aError = nullptr) const override; + virtual void DispatchClickEvent(nsIContent* aContent, uint32_t aActionIndex) override; // XULTreeGridCellAccessible diff --git a/browser/components/dirprovider/DirectoryProvider.h b/browser/components/dirprovider/DirectoryProvider.h index 3a95a2dad0d8..43fa85ab9387 100644 --- a/browser/components/dirprovider/DirectoryProvider.h +++ b/browser/components/dirprovider/DirectoryProvider.h @@ -17,7 +17,7 @@ namespace mozilla { namespace browser { -class DirectoryProvider MOZ_FINAL : public nsIDirectoryServiceProvider2 +class DirectoryProvider final : public nsIDirectoryServiceProvider2 { public: NS_DECL_ISUPPORTS @@ -27,7 +27,7 @@ public: private: ~DirectoryProvider() {} - class AppendingEnumerator MOZ_FINAL : public nsISimpleEnumerator + class AppendingEnumerator final : public nsISimpleEnumerator { public: NS_DECL_ISUPPORTS diff --git a/browser/components/feeds/nsFeedSniffer.h b/browser/components/feeds/nsFeedSniffer.h index 165211504635..57e10d954d09 100644 --- a/browser/components/feeds/nsFeedSniffer.h +++ b/browser/components/feeds/nsFeedSniffer.h @@ -9,7 +9,7 @@ #include "nsStringAPI.h" #include "mozilla/Attributes.h" -class nsFeedSniffer MOZ_FINAL : public nsIContentSniffer, +class nsFeedSniffer final : public nsIContentSniffer, nsIStreamListener { public: diff --git a/browser/components/migration/nsIEHistoryEnumerator.h b/browser/components/migration/nsIEHistoryEnumerator.h index 47ebc09bb367..7d4f8b7629df 100644 --- a/browser/components/migration/nsIEHistoryEnumerator.h +++ b/browser/components/migration/nsIEHistoryEnumerator.h @@ -12,7 +12,7 @@ #include "nsIWritablePropertyBag2.h" #include "nsAutoPtr.h" -class nsIEHistoryEnumerator MOZ_FINAL : public nsISimpleEnumerator +class nsIEHistoryEnumerator final : public nsISimpleEnumerator { public: NS_DECL_ISUPPORTS diff --git a/browser/components/shell/nsGNOMEShellService.h b/browser/components/shell/nsGNOMEShellService.h index 8444b5a66d02..ec435a53a428 100644 --- a/browser/components/shell/nsGNOMEShellService.h +++ b/browser/components/shell/nsGNOMEShellService.h @@ -10,7 +10,7 @@ #include "nsStringAPI.h" #include "mozilla/Attributes.h" -class nsGNOMEShellService MOZ_FINAL : public nsIShellService +class nsGNOMEShellService final : public nsIShellService { public: nsGNOMEShellService() : mCheckedThisSession(false), mAppIsInPath(false) { } diff --git a/caps/nsNullPrincipal.h b/caps/nsNullPrincipal.h index 1a6034ce9d5c..c1156c23f3dc 100644 --- a/caps/nsNullPrincipal.h +++ b/caps/nsNullPrincipal.h @@ -27,7 +27,7 @@ class nsIURI; #define NS_NULLPRINCIPAL_SCHEME "moz-nullprincipal" -class nsNullPrincipal MOZ_FINAL : public nsJSPrincipals +class nsNullPrincipal final : public nsJSPrincipals { public: nsNullPrincipal(); @@ -47,12 +47,12 @@ public: nsresult Init(uint32_t aAppId = nsIScriptSecurityManager::NO_APP_ID, bool aInMozBrowser = false); - virtual void GetScriptLocation(nsACString &aStr) MOZ_OVERRIDE; + virtual void GetScriptLocation(nsACString &aStr) override; static nsresult GenerateNullPrincipalURI(nsACString &aStr); #ifdef DEBUG - virtual void dumpImpl() MOZ_OVERRIDE; + virtual void dumpImpl() override; #endif protected: diff --git a/caps/nsNullPrincipalURI.h b/caps/nsNullPrincipalURI.h index d87005324bc7..1837fcaa6183 100644 --- a/caps/nsNullPrincipalURI.h +++ b/caps/nsNullPrincipalURI.h @@ -24,7 +24,7 @@ {0x51fcd543, 0x3b52, 0x41f7, \ {0xb9, 0x1b, 0x6b, 0x54, 0x10, 0x22, 0x36, 0xe6} } -class nsNullPrincipalURI MOZ_FINAL : public nsIURI +class nsNullPrincipalURI final : public nsIURI , public nsISizeOf , public nsIIPCSerializableURI { @@ -34,8 +34,8 @@ public: NS_DECL_NSIIPCSERIALIZABLEURI // nsISizeOf - virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE; - virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE; + virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const override; + virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const override; explicit nsNullPrincipalURI(const nsCString &aSpec); diff --git a/caps/nsPrincipal.h b/caps/nsPrincipal.h index 16b46dd1c8a1..24f9631c38d2 100644 --- a/caps/nsPrincipal.h +++ b/caps/nsPrincipal.h @@ -44,31 +44,31 @@ protected: nsCOMPtr mCSP; }; -class nsPrincipal MOZ_FINAL : public nsBasePrincipal +class nsPrincipal final : public nsBasePrincipal { public: NS_DECL_ISUPPORTS_INHERITED NS_DECL_NSISERIALIZABLE - NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE; - NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE; - NS_IMETHOD GetHashValue(uint32_t* aHashValue) MOZ_OVERRIDE; - NS_IMETHOD GetURI(nsIURI** aURI) MOZ_OVERRIDE; - NS_IMETHOD GetDomain(nsIURI** aDomain) MOZ_OVERRIDE; - NS_IMETHOD SetDomain(nsIURI* aDomain) MOZ_OVERRIDE; - NS_IMETHOD GetOrigin(char** aOrigin) MOZ_OVERRIDE; - NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE; - NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE; - NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal) MOZ_OVERRIDE; - NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix) MOZ_OVERRIDE; - NS_IMETHOD GetAppStatus(uint16_t* aAppStatus) MOZ_OVERRIDE; - NS_IMETHOD GetAppId(uint32_t* aAppStatus) MOZ_OVERRIDE; - NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement) MOZ_OVERRIDE; - NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId) MOZ_OVERRIDE; - NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal) MOZ_OVERRIDE; - NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) MOZ_OVERRIDE; - virtual bool IsOnCSSUnprefixingWhitelist() MOZ_OVERRIDE; + NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval) override; + NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval) override; + NS_IMETHOD GetHashValue(uint32_t* aHashValue) override; + NS_IMETHOD GetURI(nsIURI** aURI) override; + NS_IMETHOD GetDomain(nsIURI** aDomain) override; + NS_IMETHOD SetDomain(nsIURI* aDomain) override; + NS_IMETHOD GetOrigin(char** aOrigin) override; + NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval) override; + NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval) override; + NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal) override; + NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix) override; + NS_IMETHOD GetAppStatus(uint16_t* aAppStatus) override; + NS_IMETHOD GetAppId(uint32_t* aAppStatus) override; + NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement) override; + NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId) override; + NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal) override; + NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override; + virtual bool IsOnCSSUnprefixingWhitelist() override; #ifdef DEBUG - virtual void dumpImpl() MOZ_OVERRIDE; + virtual void dumpImpl() override; #endif nsPrincipal(); @@ -78,7 +78,7 @@ public: uint32_t aAppId, bool aInMozBrowser); - virtual void GetScriptLocation(nsACString& aStr) MOZ_OVERRIDE; + virtual void GetScriptLocation(nsACString& aStr) override; void SetURI(nsIURI* aURI); static bool IsPrincipalInherited(nsIURI* aURI) { @@ -139,29 +139,29 @@ public: NS_DECL_ISUPPORTS_INHERITED NS_DECL_NSIEXPANDEDPRINCIPAL NS_DECL_NSISERIALIZABLE - NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE; - NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE; - NS_IMETHOD GetHashValue(uint32_t* aHashValue) MOZ_OVERRIDE; - NS_IMETHOD GetURI(nsIURI** aURI) MOZ_OVERRIDE; - NS_IMETHOD GetDomain(nsIURI** aDomain) MOZ_OVERRIDE; - NS_IMETHOD SetDomain(nsIURI* aDomain) MOZ_OVERRIDE; - NS_IMETHOD GetOrigin(char** aOrigin) MOZ_OVERRIDE; - NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE; - NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE; - NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal) MOZ_OVERRIDE; - NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix) MOZ_OVERRIDE; - NS_IMETHOD GetAppStatus(uint16_t* aAppStatus) MOZ_OVERRIDE; - NS_IMETHOD GetAppId(uint32_t* aAppStatus) MOZ_OVERRIDE; - NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement) MOZ_OVERRIDE; - NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId) MOZ_OVERRIDE; - NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal) MOZ_OVERRIDE; - NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) MOZ_OVERRIDE; - virtual bool IsOnCSSUnprefixingWhitelist() MOZ_OVERRIDE; + NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval) override; + NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval) override; + NS_IMETHOD GetHashValue(uint32_t* aHashValue) override; + NS_IMETHOD GetURI(nsIURI** aURI) override; + NS_IMETHOD GetDomain(nsIURI** aDomain) override; + NS_IMETHOD SetDomain(nsIURI* aDomain) override; + NS_IMETHOD GetOrigin(char** aOrigin) override; + NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval) override; + NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval) override; + NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal) override; + NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix) override; + NS_IMETHOD GetAppStatus(uint16_t* aAppStatus) override; + NS_IMETHOD GetAppId(uint32_t* aAppStatus) override; + NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement) override; + NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId) override; + NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal) override; + NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override; + virtual bool IsOnCSSUnprefixingWhitelist() override; #ifdef DEBUG - virtual void dumpImpl() MOZ_OVERRIDE; + virtual void dumpImpl() override; #endif - virtual void GetScriptLocation(nsACString &aStr) MOZ_OVERRIDE; + virtual void GetScriptLocation(nsACString &aStr) override; private: nsTArray< nsCOMPtr > mPrincipals; diff --git a/caps/nsScriptSecurityManager.h b/caps/nsScriptSecurityManager.h index 61e871eb8e6c..646114d211d2 100644 --- a/caps/nsScriptSecurityManager.h +++ b/caps/nsScriptSecurityManager.h @@ -32,7 +32,7 @@ class ClassInfoData; { 0x7ee2a4c0, 0x4b93, 0x17d3, \ { 0xba, 0x18, 0x00, 0x60, 0xb0, 0xf1, 0x99, 0xa2 }} -class nsScriptSecurityManager MOZ_FINAL : public nsIScriptSecurityManager, +class nsScriptSecurityManager final : public nsIScriptSecurityManager, public nsIChannelEventSink, public nsIObserver { diff --git a/caps/nsSystemPrincipal.h b/caps/nsSystemPrincipal.h index 26cdb91f8199..479a14983035 100644 --- a/caps/nsSystemPrincipal.h +++ b/caps/nsSystemPrincipal.h @@ -17,7 +17,7 @@ #define NS_SYSTEMPRINCIPAL_CONTRACTID "@mozilla.org/systemprincipal;1" -class nsSystemPrincipal MOZ_FINAL : public nsJSPrincipals +class nsSystemPrincipal final : public nsJSPrincipals { public: // Our refcount is managed by nsJSPrincipals. Use this macro to avoid @@ -28,10 +28,10 @@ public: nsSystemPrincipal(); - virtual void GetScriptLocation(nsACString &aStr) MOZ_OVERRIDE; + virtual void GetScriptLocation(nsACString &aStr) override; #ifdef DEBUG - virtual void dumpImpl() MOZ_OVERRIDE; + virtual void dumpImpl() override; #endif protected: diff --git a/chrome/nsChromeProtocolHandler.h b/chrome/nsChromeProtocolHandler.h index ea14aa8e2574..0d86b009db4f 100644 --- a/chrome/nsChromeProtocolHandler.h +++ b/chrome/nsChromeProtocolHandler.h @@ -18,7 +18,7 @@ {0x8c, 0xd0, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \ } -class nsChromeProtocolHandler MOZ_FINAL : public nsIProtocolHandler, +class nsChromeProtocolHandler final : public nsIProtocolHandler, public nsSupportsWeakReference { public: diff --git a/chrome/nsChromeRegistry.h b/chrome/nsChromeRegistry.h index 05edd0063865..fae047b747d0 100644 --- a/chrome/nsChromeRegistry.h +++ b/chrome/nsChromeRegistry.h @@ -47,20 +47,20 @@ public: NS_DECL_ISUPPORTS // nsIXULChromeRegistry methods: - NS_IMETHOD ReloadChrome() MOZ_OVERRIDE; - NS_IMETHOD RefreshSkins() MOZ_OVERRIDE; + NS_IMETHOD ReloadChrome() override; + NS_IMETHOD RefreshSkins() override; NS_IMETHOD AllowScriptsForPackage(nsIURI* url, - bool* _retval) MOZ_OVERRIDE; + bool* _retval) override; NS_IMETHOD AllowContentToAccess(nsIURI* url, - bool* _retval) MOZ_OVERRIDE; + bool* _retval) override; NS_IMETHOD CanLoadURLRemotely(nsIURI* url, - bool* _retval) MOZ_OVERRIDE; + bool* _retval) override; NS_IMETHOD MustLoadURLRemotely(nsIURI* url, - bool* _retval) MOZ_OVERRIDE; + bool* _retval) override; // nsIChromeRegistry methods: - NS_IMETHOD_(bool) WrappersEnabled(nsIURI *aURI) MOZ_OVERRIDE; - NS_IMETHOD ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult) MOZ_OVERRIDE; + NS_IMETHOD_(bool) WrappersEnabled(nsIURI *aURI) override; + NS_IMETHOD ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult) override; // nsChromeRegistry methods: nsChromeRegistry() : mInitialized(false) { } diff --git a/chrome/nsChromeRegistryChrome.h b/chrome/nsChromeRegistryChrome.h index 285b48a76f02..b10e50416cbc 100644 --- a/chrome/nsChromeRegistryChrome.h +++ b/chrome/nsChromeRegistryChrome.h @@ -27,24 +27,24 @@ class nsChromeRegistryChrome : public nsChromeRegistry nsChromeRegistryChrome(); ~nsChromeRegistryChrome(); - nsresult Init() MOZ_OVERRIDE; + nsresult Init() override; - NS_IMETHOD CheckForNewChrome() MOZ_OVERRIDE; - NS_IMETHOD CheckForOSAccessibility() MOZ_OVERRIDE; + NS_IMETHOD CheckForNewChrome() override; + NS_IMETHOD CheckForOSAccessibility() override; NS_IMETHOD GetLocalesForPackage(const nsACString& aPackage, - nsIUTF8StringEnumerator* *aResult) MOZ_OVERRIDE; + nsIUTF8StringEnumerator* *aResult) override; NS_IMETHOD IsLocaleRTL(const nsACString& package, - bool *aResult) MOZ_OVERRIDE; + bool *aResult) override; NS_IMETHOD GetSelectedLocale(const nsACString& aPackage, - nsACString& aLocale) MOZ_OVERRIDE; + nsACString& aLocale) override; NS_IMETHOD Observe(nsISupports *aSubject, const char *aTopic, - const char16_t *someData) MOZ_OVERRIDE; + const char16_t *someData) override; #ifdef MOZ_XUL NS_IMETHOD GetXULOverlays(nsIURI *aURI, - nsISimpleEnumerator **_retval) MOZ_OVERRIDE; + nsISimpleEnumerator **_retval) override; NS_IMETHOD GetStyleOverlays(nsIURI *aURI, - nsISimpleEnumerator **_retval) MOZ_OVERRIDE; + nsISimpleEnumerator **_retval) override; #endif // If aChild is non-null then it is a new child to notify. If aChild is @@ -66,12 +66,12 @@ class nsChromeRegistryChrome : public nsChromeRegistry nsresult OverrideLocalePackage(const nsACString& aPackage, nsACString& aOverride); nsresult SelectLocaleFromPref(nsIPrefBranch* prefs); - nsresult UpdateSelectedLocale() MOZ_OVERRIDE; + nsresult UpdateSelectedLocale() override; nsIURI* GetBaseURIFromPackage(const nsCString& aPackage, const nsCString& aProvider, - const nsCString& aPath) MOZ_OVERRIDE; + const nsCString& aPath) override; nsresult GetFlagsFromPackage(const nsCString& aPackage, - uint32_t* aFlags) MOZ_OVERRIDE; + uint32_t* aFlags) override; struct ProviderEntry { @@ -166,19 +166,19 @@ class nsChromeRegistryChrome : public nsChromeRegistry nsClassHashtable mPackagesHash; virtual void ManifestContent(ManifestProcessingContext& cx, int lineno, - char *const * argv, int flags) MOZ_OVERRIDE; + char *const * argv, int flags) override; virtual void ManifestLocale(ManifestProcessingContext& cx, int lineno, - char *const * argv, int flags) MOZ_OVERRIDE; + char *const * argv, int flags) override; virtual void ManifestSkin(ManifestProcessingContext& cx, int lineno, - char *const * argv, int flags) MOZ_OVERRIDE; + char *const * argv, int flags) override; virtual void ManifestOverlay(ManifestProcessingContext& cx, int lineno, - char *const * argv, int flags) MOZ_OVERRIDE; + char *const * argv, int flags) override; virtual void ManifestStyle(ManifestProcessingContext& cx, int lineno, - char *const * argv, int flags) MOZ_OVERRIDE; + char *const * argv, int flags) override; virtual void ManifestOverride(ManifestProcessingContext& cx, int lineno, - char *const * argv, int flags) MOZ_OVERRIDE; + char *const * argv, int flags) override; virtual void ManifestResource(ManifestProcessingContext& cx, int lineno, - char *const * argv, int flags) MOZ_OVERRIDE; + char *const * argv, int flags) override; }; #endif // nsChromeRegistryChrome_h diff --git a/chrome/nsChromeRegistryContent.h b/chrome/nsChromeRegistryContent.h index 5d88ae3a8254..e7dc8848a487 100644 --- a/chrome/nsChromeRegistryContent.h +++ b/chrome/nsChromeRegistryContent.h @@ -25,19 +25,19 @@ class nsChromeRegistryContent : public nsChromeRegistry bool aReset); NS_IMETHOD GetLocalesForPackage(const nsACString& aPackage, - nsIUTF8StringEnumerator* *aResult) MOZ_OVERRIDE; - NS_IMETHOD CheckForNewChrome() MOZ_OVERRIDE; - NS_IMETHOD CheckForOSAccessibility() MOZ_OVERRIDE; + nsIUTF8StringEnumerator* *aResult) override; + NS_IMETHOD CheckForNewChrome() override; + NS_IMETHOD CheckForOSAccessibility() override; NS_IMETHOD Observe(nsISupports* aSubject, const char* aTopic, - const char16_t* aData) MOZ_OVERRIDE; + const char16_t* aData) override; NS_IMETHOD IsLocaleRTL(const nsACString& package, - bool *aResult) MOZ_OVERRIDE; + bool *aResult) override; NS_IMETHOD GetSelectedLocale(const nsACString& aPackage, - nsACString& aLocale) MOZ_OVERRIDE; + nsACString& aLocale) override; NS_IMETHOD GetStyleOverlays(nsIURI *aChromeURL, - nsISimpleEnumerator **aResult) MOZ_OVERRIDE; + nsISimpleEnumerator **aResult) override; NS_IMETHOD GetXULOverlays(nsIURI *aChromeURL, - nsISimpleEnumerator **aResult) MOZ_OVERRIDE; + nsISimpleEnumerator **aResult) override; void RegisterPackage(const ChromePackage& aPackage); void RegisterOverride(const OverrideMapping& aOverride); @@ -55,29 +55,29 @@ class nsChromeRegistryContent : public nsChromeRegistry uint32_t flags; }; - nsresult UpdateSelectedLocale() MOZ_OVERRIDE; + nsresult UpdateSelectedLocale() override; nsIURI* GetBaseURIFromPackage(const nsCString& aPackage, const nsCString& aProvider, - const nsCString& aPath) MOZ_OVERRIDE; - nsresult GetFlagsFromPackage(const nsCString& aPackage, uint32_t* aFlags) MOZ_OVERRIDE; + const nsCString& aPath) override; + nsresult GetFlagsFromPackage(const nsCString& aPackage, uint32_t* aFlags) override; nsClassHashtable mPackagesHash; nsCString mLocale; virtual void ManifestContent(ManifestProcessingContext& cx, int lineno, - char *const * argv, int flags) MOZ_OVERRIDE; + char *const * argv, int flags) override; virtual void ManifestLocale(ManifestProcessingContext& cx, int lineno, - char *const * argv, int flags) MOZ_OVERRIDE; + char *const * argv, int flags) override; virtual void ManifestSkin(ManifestProcessingContext& cx, int lineno, - char *const * argv, int flags) MOZ_OVERRIDE; + char *const * argv, int flags) override; virtual void ManifestOverlay(ManifestProcessingContext& cx, int lineno, - char *const * argv, int flags) MOZ_OVERRIDE; + char *const * argv, int flags) override; virtual void ManifestStyle(ManifestProcessingContext& cx, int lineno, - char *const * argv, int flags) MOZ_OVERRIDE; + char *const * argv, int flags) override; virtual void ManifestOverride(ManifestProcessingContext& cx, int lineno, - char *const * argv, int flags) MOZ_OVERRIDE; + char *const * argv, int flags) override; virtual void ManifestResource(ManifestProcessingContext& cx, int lineno, - char *const * argv, int flags) MOZ_OVERRIDE; + char *const * argv, int flags) override; }; #endif // nsChromeRegistryContent_h diff --git a/docshell/base/IHistory.h b/docshell/base/IHistory.h index 806031b409ad..bdaa85238a7d 100644 --- a/docshell/base/IHistory.h +++ b/docshell/base/IHistory.h @@ -131,14 +131,14 @@ NS_DEFINE_STATIC_IID_ACCESSOR(IHistory, IHISTORY_IID) #define NS_DECL_IHISTORY \ NS_IMETHOD RegisterVisitedCallback(nsIURI* aURI, \ - mozilla::dom::Link* aContent) MOZ_OVERRIDE; \ + mozilla::dom::Link* aContent) override; \ NS_IMETHOD UnregisterVisitedCallback(nsIURI* aURI, \ - mozilla::dom::Link* aContent) MOZ_OVERRIDE; \ + mozilla::dom::Link* aContent) override; \ NS_IMETHOD VisitURI(nsIURI* aURI, \ nsIURI* aLastVisitedURI, \ - uint32_t aFlags) MOZ_OVERRIDE; \ - NS_IMETHOD SetURITitle(nsIURI* aURI, const nsAString& aTitle) MOZ_OVERRIDE; \ - NS_IMETHOD NotifyVisited(nsIURI* aURI) MOZ_OVERRIDE; + uint32_t aFlags) override; \ + NS_IMETHOD SetURITitle(nsIURI* aURI, const nsAString& aTitle) override; \ + NS_IMETHOD NotifyVisited(nsIURI* aURI) override; } // namespace mozilla diff --git a/docshell/base/LoadContext.h b/docshell/base/LoadContext.h index f3384755211f..1ab5cba4144b 100644 --- a/docshell/base/LoadContext.h +++ b/docshell/base/LoadContext.h @@ -31,7 +31,7 @@ namespace mozilla { * to separate the safebrowsing cookie. */ -class LoadContext MOZ_FINAL +class LoadContext final : public nsILoadContext , public nsIInterfaceRequestor { diff --git a/docshell/base/nsDSURIContentListener.h b/docshell/base/nsDSURIContentListener.h index d5625573d091..f33d1c045ec2 100644 --- a/docshell/base/nsDSURIContentListener.h +++ b/docshell/base/nsDSURIContentListener.h @@ -16,7 +16,7 @@ class nsIWebNavigationInfo; class nsIHttpChannel; class nsAString; -class nsDSURIContentListener MOZ_FINAL +class nsDSURIContentListener final : public nsIURIContentListener , public nsSupportsWeakReference { diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index cc6fcefd7538..7d1191802d08 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -424,7 +424,7 @@ IsSameHost(nsIURI* aUri1, nsIURI* aUri2) return host1.Equals(host2); } -class nsPingListener MOZ_FINAL +class nsPingListener final : public nsIStreamListener , public nsIInterfaceRequestor , public nsIChannelEventSink @@ -9379,7 +9379,7 @@ namespace { #ifdef MOZ_PLACES // Callback used by CopyFavicon to inform the favicon service that one URI // (mNewURI) has the same favicon URI (OnComplete's aFaviconURI) as another. -class nsCopyFaviconCallback MOZ_FINAL : public nsIFaviconDataCallback +class nsCopyFaviconCallback final : public nsIFaviconDataCallback { public: NS_DECL_ISUPPORTS @@ -9392,7 +9392,7 @@ public: NS_IMETHODIMP OnComplete(nsIURI* aFaviconURI, uint32_t aDataLen, - const uint8_t* aData, const nsACString& aMimeType) MOZ_OVERRIDE + const uint8_t* aData, const nsACString& aMimeType) override { // Continue only if there is an associated favicon. if (!aFaviconURI) { diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h index 15b5954fb04e..b1c7ef8f109b 100644 --- a/docshell/base/nsDocShell.h +++ b/docshell/base/nsDocShell.h @@ -135,7 +135,7 @@ enum eCharsetReloadState //*** nsDocShell //***************************************************************************** -class nsDocShell MOZ_FINAL +class nsDocShell final : public nsDocLoader , public nsIDocShell , public nsIWebNavigation @@ -165,7 +165,7 @@ public: NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW - virtual nsresult Init() MOZ_OVERRIDE; + virtual nsresult Init() override; NS_DECL_ISUPPORTS_INHERITED @@ -187,7 +187,7 @@ public: NS_DECL_NSINETWORKINTERCEPTCONTROLLER NS_FORWARD_SAFE_NSIDOMSTORAGEMANAGER(TopSessionStorageManager()) - NS_IMETHOD Stop() MOZ_OVERRIDE { + NS_IMETHOD Stop() override { // Need this here because otherwise nsIWebNavigation::Stop // overrides the docloader's Stop() return nsDocLoader::Stop(); @@ -204,7 +204,7 @@ public: const nsAString& aFileName, nsIInputStream* aPostDataStream, nsIInputStream* aHeadersDataStream, - bool aIsTrusted) MOZ_OVERRIDE; + bool aIsTrusted) override; NS_IMETHOD OnLinkClickSync(nsIContent* aContent, nsIURI* aURI, const char16_t* aTargetSpec, @@ -212,11 +212,11 @@ public: nsIInputStream* aPostDataStream = 0, nsIInputStream* aHeadersDataStream = 0, nsIDocShell** aDocShell = 0, - nsIRequest** aRequest = 0) MOZ_OVERRIDE; + nsIRequest** aRequest = 0) override; NS_IMETHOD OnOverLink(nsIContent* aContent, nsIURI* aURI, - const char16_t* aTargetSpec) MOZ_OVERRIDE; - NS_IMETHOD OnLeaveLink() MOZ_OVERRIDE; + const char16_t* aTargetSpec) override; + NS_IMETHOD OnLeaveLink() override; nsDocShellInfoLoadType ConvertLoadTypeToDocShellLoadInfo(uint32_t aLoadType); uint32_t ConvertDocShellLoadInfoToLoadType( @@ -224,17 +224,17 @@ public: // Don't use NS_DECL_NSILOADCONTEXT because some of nsILoadContext's methods // are shared with nsIDocShell (appID, etc.) and can't be declared twice. - NS_IMETHOD GetAssociatedWindow(nsIDOMWindow**) MOZ_OVERRIDE; - NS_IMETHOD GetTopWindow(nsIDOMWindow**) MOZ_OVERRIDE; - NS_IMETHOD GetTopFrameElement(nsIDOMElement**) MOZ_OVERRIDE; - NS_IMETHOD GetNestedFrameId(uint64_t*) MOZ_OVERRIDE; - NS_IMETHOD IsAppOfType(uint32_t, bool*) MOZ_OVERRIDE; - NS_IMETHOD GetIsContent(bool*) MOZ_OVERRIDE; - NS_IMETHOD GetUsePrivateBrowsing(bool*) MOZ_OVERRIDE; - NS_IMETHOD SetUsePrivateBrowsing(bool) MOZ_OVERRIDE; - NS_IMETHOD SetPrivateBrowsing(bool) MOZ_OVERRIDE; - NS_IMETHOD GetUseRemoteTabs(bool*) MOZ_OVERRIDE; - NS_IMETHOD SetRemoteTabs(bool) MOZ_OVERRIDE; + NS_IMETHOD GetAssociatedWindow(nsIDOMWindow**) override; + NS_IMETHOD GetTopWindow(nsIDOMWindow**) override; + NS_IMETHOD GetTopFrameElement(nsIDOMElement**) override; + NS_IMETHOD GetNestedFrameId(uint64_t*) override; + NS_IMETHOD IsAppOfType(uint32_t, bool*) override; + NS_IMETHOD GetIsContent(bool*) override; + NS_IMETHOD GetUsePrivateBrowsing(bool*) override; + NS_IMETHOD SetUsePrivateBrowsing(bool) override; + NS_IMETHOD SetPrivateBrowsing(bool) override; + NS_IMETHOD GetUseRemoteTabs(bool*) override; + NS_IMETHOD SetRemoteTabs(bool) override; // Restores a cached presentation from history (mLSHE). // This method swaps out the content viewer and simulates loads for @@ -281,7 +281,7 @@ public: protected: // Object Management virtual ~nsDocShell(); - virtual void DestroyChildren() MOZ_OVERRIDE; + virtual void DestroyChildren() override; // Content Viewer Management nsresult EnsureContentViewer(); @@ -456,7 +456,7 @@ protected: virtual void OnRedirectStateChange(nsIChannel* aOldChannel, nsIChannel* aNewChannel, uint32_t aRedirectFlags, - uint32_t aStateFlags) MOZ_OVERRIDE; + uint32_t aStateFlags) override; /** * Helper function that determines if channel is an HTTP POST. @@ -691,7 +691,7 @@ protected: int32_t aCurVerticalPos); // Override the parent setter from nsDocLoader - virtual nsresult SetDocLoaderParent(nsDocLoader* aLoader) MOZ_OVERRIDE; + virtual nsresult SetDocLoaderParent(nsDocLoader* aLoader) override; void ClearFrameHistory(nsISHEntry* aEntry); diff --git a/docshell/base/nsDownloadHistory.h b/docshell/base/nsDownloadHistory.h index 4ef268d4dd18..4a4c20ddfdf3 100644 --- a/docshell/base/nsDownloadHistory.h +++ b/docshell/base/nsDownloadHistory.h @@ -13,7 +13,7 @@ #define NS_DOWNLOADHISTORY_CID \ {0x2ee83680, 0x2af0, 0x4bcb, {0xbf, 0xa0, 0xc9, 0x70, 0x5f, 0x65, 0x54, 0xf1}} -class nsDownloadHistory MOZ_FINAL : public nsIDownloadHistory +class nsDownloadHistory final : public nsIDownloadHistory { public: NS_DECL_ISUPPORTS diff --git a/docshell/base/nsIWebShellServices.h b/docshell/base/nsIWebShellServices.h index fde51f06e6ac..2781da289a3e 100644 --- a/docshell/base/nsIWebShellServices.h +++ b/docshell/base/nsIWebShellServices.h @@ -32,7 +32,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIWebShellServices, NS_IWEB_SHELL_SERVICES_IID) /* Use this macro when declaring classes that implement this interface. */ #define NS_DECL_NSIWEBSHELLSERVICES \ NS_IMETHOD ReloadDocument(const char* aCharset = nullptr, \ - int32_t aSource = kCharsetUninitialized) MOZ_OVERRIDE; \ - NS_IMETHOD StopDocumentLoad(void) MOZ_OVERRIDE; + int32_t aSource = kCharsetUninitialized) override; \ + NS_IMETHOD StopDocumentLoad(void) override; #endif /* nsIWebShellServices_h___ */ diff --git a/docshell/base/nsWebNavigationInfo.h b/docshell/base/nsWebNavigationInfo.h index 5d2f7be5fa1f..430fb95aa846 100644 --- a/docshell/base/nsWebNavigationInfo.h +++ b/docshell/base/nsWebNavigationInfo.h @@ -18,7 +18,7 @@ class nsCString; #define NS_WEBNAVIGATION_INFO_CID \ { 0xf30bc0a2, 0x958b, 0x4287,{0xbf, 0x62, 0xce, 0x38, 0xba, 0x0c, 0x81, 0x1e}} -class nsWebNavigationInfo MOZ_FINAL : public nsIWebNavigationInfo +class nsWebNavigationInfo final : public nsIWebNavigationInfo { public: nsWebNavigationInfo() {} diff --git a/docshell/shistory/src/nsSHEntry.h b/docshell/shistory/src/nsSHEntry.h index 5a681a5fa2cc..cc00572035f0 100644 --- a/docshell/shistory/src/nsSHEntry.h +++ b/docshell/shistory/src/nsSHEntry.h @@ -22,7 +22,7 @@ class nsSHEntryShared; class nsIInputStream; class nsIURI; -class nsSHEntry MOZ_FINAL : public nsISHEntry, +class nsSHEntry final : public nsISHEntry, public nsISHContainer, public nsISHEntryInternal { diff --git a/docshell/shistory/src/nsSHEntryShared.cpp b/docshell/shistory/src/nsSHEntryShared.cpp index b2c173030b54..2c3a6fedbba2 100644 --- a/docshell/shistory/src/nsSHEntryShared.cpp +++ b/docshell/shistory/src/nsSHEntryShared.cpp @@ -32,7 +32,7 @@ uint64_t gSHEntrySharedID = 0; #define CONTENT_VIEWER_TIMEOUT_SECONDS_DEFAULT (30*60) typedef nsExpirationTracker HistoryTrackerBase; -class HistoryTracker MOZ_FINAL : public HistoryTrackerBase { +class HistoryTracker final : public HistoryTrackerBase { public: explicit HistoryTracker(uint32_t aTimeout) : HistoryTrackerBase(1000 * aTimeout / 2) diff --git a/docshell/shistory/src/nsSHEntryShared.h b/docshell/shistory/src/nsSHEntryShared.h index adb59e9b0a40..1e7a2e67775a 100644 --- a/docshell/shistory/src/nsSHEntryShared.h +++ b/docshell/shistory/src/nsSHEntryShared.h @@ -30,7 +30,7 @@ class nsISupportsArray; // back/forward cache. // // nsSHEntryShared is the vehicle for this sharing. -class nsSHEntryShared MOZ_FINAL : public nsIBFCacheEntry, +class nsSHEntryShared final : public nsIBFCacheEntry, public nsIMutationObserver { public: diff --git a/docshell/shistory/src/nsSHistory.cpp b/docshell/shistory/src/nsSHistory.cpp index a3bf59bb246d..840e2a823219 100644 --- a/docshell/shistory/src/nsSHistory.cpp +++ b/docshell/shistory/src/nsSHistory.cpp @@ -165,7 +165,7 @@ enum HistCmd{ //*** nsSHistoryObserver //***************************************************************************** -class nsSHistoryObserver MOZ_FINAL : public nsIObserver +class nsSHistoryObserver final : public nsIObserver { public: diff --git a/docshell/shistory/src/nsSHistory.h b/docshell/shistory/src/nsSHistory.h index 32b7a294d75a..71237cfd334c 100644 --- a/docshell/shistory/src/nsSHistory.h +++ b/docshell/shistory/src/nsSHistory.h @@ -27,7 +27,7 @@ class nsSHistoryObserver; class nsISHEntry; class nsISHTransaction; -class nsSHistory MOZ_FINAL : public PRCList, +class nsSHistory final : public PRCList, public nsISHistory, public nsISHistoryInternal, public nsIWebNavigation diff --git a/dom/activities/Activity.h b/dom/activities/Activity.h index 7e06eb57552b..48081e09460b 100644 --- a/dom/activities/Activity.h +++ b/dom/activities/Activity.h @@ -21,7 +21,7 @@ public: NS_DECL_ISUPPORTS_INHERITED NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(Activity, DOMRequest) - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; static already_AddRefed Constructor(const GlobalObject& aOwner, diff --git a/dom/alarm/AlarmHalService.h b/dom/alarm/AlarmHalService.h index 712319467d7f..3c35fcd1308f 100644 --- a/dom/alarm/AlarmHalService.h +++ b/dom/alarm/AlarmHalService.h @@ -34,10 +34,10 @@ public: static already_AddRefed GetInstance(); // Implementing hal::AlarmObserver - void Notify(const void_t& aVoid) MOZ_OVERRIDE; + void Notify(const void_t& aVoid) override; // Implementing hal::SystemTimezoneChangeObserver - void Notify(const hal::SystemTimezoneChangeInformation& aSystemTimezoneChangeInfo) MOZ_OVERRIDE; + void Notify(const hal::SystemTimezoneChangeInformation& aSystemTimezoneChangeInfo) override; private: virtual ~AlarmHalService(); diff --git a/dom/animation/Animation.h b/dom/animation/Animation.h index b6c60738c7b0..d5afac1c182f 100644 --- a/dom/animation/Animation.h +++ b/dom/animation/Animation.h @@ -204,7 +204,7 @@ public: NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(Animation) nsIDocument* GetParentObject() const { return mDocument; } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; // FIXME: If we succeed in moving transition-specific code to a type of // AnimationEffect (as per the Web Animations API) we should remove these diff --git a/dom/animation/AnimationEffect.h b/dom/animation/AnimationEffect.h index 60261e7dafac..3c07e746b498 100644 --- a/dom/animation/AnimationEffect.h +++ b/dom/animation/AnimationEffect.h @@ -15,7 +15,7 @@ struct JSContext; namespace mozilla { namespace dom { -class AnimationEffect MOZ_FINAL : public nsWrapperCache +class AnimationEffect final : public nsWrapperCache { public: explicit AnimationEffect(Animation* aAnimation) @@ -27,7 +27,7 @@ public: NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(AnimationEffect) Animation* GetParentObject() const { return mAnimation; } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; // AnimationEffect interface void GetName(nsString& aRetVal) const { diff --git a/dom/animation/AnimationPlayer.h b/dom/animation/AnimationPlayer.h index 97e9a995f21c..f284bcc958c5 100644 --- a/dom/animation/AnimationPlayer.h +++ b/dom/animation/AnimationPlayer.h @@ -65,7 +65,7 @@ public: NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(AnimationPlayer) AnimationTimeline* GetParentObject() const { return mTimeline; } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; virtual CSSAnimationPlayer* AsCSSAnimationPlayer() { return nullptr; } virtual CSSTransitionPlayer* AsCSSTransitionPlayer() { return nullptr; } diff --git a/dom/animation/AnimationTimeline.h b/dom/animation/AnimationTimeline.h index 81905de124aa..6a1f320ab0ea 100644 --- a/dom/animation/AnimationTimeline.h +++ b/dom/animation/AnimationTimeline.h @@ -20,7 +20,7 @@ struct JSContext; namespace mozilla { namespace dom { -class AnimationTimeline MOZ_FINAL : public nsWrapperCache +class AnimationTimeline final : public nsWrapperCache { public: explicit AnimationTimeline(nsIDocument* aDocument) @@ -41,7 +41,7 @@ public: { return mWindow; } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; // AnimationTimeline methods Nullable GetCurrentTime() const; diff --git a/dom/animation/PendingPlayerTracker.h b/dom/animation/PendingPlayerTracker.h index a07738420ee0..9f974dd5ac74 100644 --- a/dom/animation/PendingPlayerTracker.h +++ b/dom/animation/PendingPlayerTracker.h @@ -15,7 +15,7 @@ class nsIFrame; namespace mozilla { -class PendingPlayerTracker MOZ_FINAL +class PendingPlayerTracker final { public: explicit PendingPlayerTracker(nsIDocument* aDocument) diff --git a/dom/archivereader/ArchiveReader.h b/dom/archivereader/ArchiveReader.h index 90991897a9c0..b84cc3c03f3c 100644 --- a/dom/archivereader/ArchiveReader.h +++ b/dom/archivereader/ArchiveReader.h @@ -32,7 +32,7 @@ class ArchiveRequest; /** * This is the ArchiveReader object */ -class ArchiveReader MOZ_FINAL : public nsISupports, +class ArchiveReader final : public nsISupports, public nsWrapperCache { public: @@ -51,7 +51,7 @@ public: return mWindow; } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; already_AddRefed GetFilenames(); already_AddRefed GetFile(const nsAString& filename); diff --git a/dom/archivereader/ArchiveRequest.h b/dom/archivereader/ArchiveRequest.h index 2ce5cced21cc..37129f4063c3 100644 --- a/dom/archivereader/ArchiveRequest.h +++ b/dom/archivereader/ArchiveRequest.h @@ -26,7 +26,7 @@ BEGIN_ARCHIVEREADER_NAMESPACE class ArchiveRequest : public mozilla::dom::DOMRequest { public: - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; ArchiveReader* Reader() const; @@ -38,7 +38,7 @@ public: ArchiveReader* aReader); // nsIDOMEventTarget - virtual nsresult PreHandleEvent(EventChainPreVisitor& aVisitor) MOZ_OVERRIDE; + virtual nsresult PreHandleEvent(EventChainPreVisitor& aVisitor) override; public: // This is called by the DOMArchiveRequestEvent diff --git a/dom/archivereader/ArchiveZipEvent.h b/dom/archivereader/ArchiveZipEvent.h index bb75ba821cf9..1af3acc633a2 100644 --- a/dom/archivereader/ArchiveZipEvent.h +++ b/dom/archivereader/ArchiveZipEvent.h @@ -28,10 +28,10 @@ protected: virtual ~ArchiveZipItem(); public: - nsresult GetFilename(nsString& aFilename) MOZ_OVERRIDE; + nsresult GetFilename(nsString& aFilename) override; // From zipItem to File: - virtual nsIDOMFile* File(ArchiveReader* aArchiveReader) MOZ_OVERRIDE; + virtual nsIDOMFile* File(ArchiveReader* aArchiveReader) override; public: // for the event static uint32_t StrToInt32(const uint8_t* aStr); @@ -58,7 +58,7 @@ public: ArchiveReaderZipEvent(ArchiveReader* aArchiveReader, const nsACString& aEncoding); - nsresult Exec() MOZ_OVERRIDE; + nsresult Exec() override; private: nsCString mEncoding; diff --git a/dom/archivereader/ArchiveZipFile.cpp b/dom/archivereader/ArchiveZipFile.cpp index ff4b196e9c5f..13e804b403af 100644 --- a/dom/archivereader/ArchiveZipFile.cpp +++ b/dom/archivereader/ArchiveZipFile.cpp @@ -20,7 +20,7 @@ USING_ARCHIVEREADER_NAMESPACE /** * Input stream object for zip files */ -class ArchiveInputStream MOZ_FINAL : public nsIInputStream, +class ArchiveInputStream final : public nsIInputStream, public nsISeekableStream { public: diff --git a/dom/archivereader/ArchiveZipFile.h b/dom/archivereader/ArchiveZipFile.h index 3b95b387bee2..05a4ca068fb4 100644 --- a/dom/archivereader/ArchiveZipFile.h +++ b/dom/archivereader/ArchiveZipFile.h @@ -56,7 +56,7 @@ public: } // Overrides: - virtual nsresult GetInternalStream(nsIInputStream**) MOZ_OVERRIDE; + virtual nsresult GetInternalStream(nsIInputStream**) override; protected: virtual ~ArchiveZipFileImpl() { @@ -65,7 +65,7 @@ protected: virtual already_AddRefed CreateSlice(uint64_t aStart, uint64_t aLength, const nsAString& aContentType, - mozilla::ErrorResult& aRv) MOZ_OVERRIDE; + mozilla::ErrorResult& aRv) override; private: // Data ZipCentral mCentral; diff --git a/dom/asmjscache/AsmJSCache.cpp b/dom/asmjscache/AsmJSCache.cpp index 9db77b35eb2e..c4dcc6987b37 100644 --- a/dom/asmjscache/AsmJSCache.cpp +++ b/dom/asmjscache/AsmJSCache.cpp @@ -1107,7 +1107,7 @@ FindHashMatch(const Metadata& aMetadata, const ReadParams& aReadParams, } // A runnable that executes for a cache access originating in the main process. -class SingleProcessRunnable MOZ_FINAL : public File, +class SingleProcessRunnable final : public File, private MainProcessRunnable { public: @@ -1136,7 +1136,7 @@ protected: private: void - OnOpenMetadataForRead(const Metadata& aMetadata) MOZ_OVERRIDE + OnOpenMetadataForRead(const Metadata& aMetadata) override { uint32_t moduleIndex; if (FindHashMatch(aMetadata, mReadParams, &moduleIndex)) { @@ -1147,26 +1147,26 @@ private: } void - OnOpenCacheFile() MOZ_OVERRIDE + OnOpenCacheFile() override { File::OnOpen(); } void - Close() MOZ_OVERRIDE MOZ_FINAL + Close() override final { MainProcessRunnable::Close(); } void - OnFailure(JS::AsmJSCacheResult aResult) MOZ_OVERRIDE + OnFailure(JS::AsmJSCacheResult aResult) override { MainProcessRunnable::OnFailure(aResult); File::OnFailure(aResult); } void - OnClose() MOZ_OVERRIDE MOZ_FINAL + OnClose() override final { MainProcessRunnable::OnClose(); File::OnClose(); @@ -1174,7 +1174,7 @@ private: // Avoid MSVC 'dominance' warning by having clear Run() override. NS_IMETHODIMP - Run() MOZ_OVERRIDE + Run() override { return MainProcessRunnable::Run(); } @@ -1185,7 +1185,7 @@ private: // A runnable that executes in a parent process for a cache access originating // in the content process. This runnable gets registered as an IPDL subprotocol // actor so that it can communicate with the corresponding ChildProcessRunnable. -class ParentProcessRunnable MOZ_FINAL : public PAsmJSCacheEntryParent, +class ParentProcessRunnable final : public PAsmJSCacheEntryParent, public MainProcessRunnable { public: @@ -1216,7 +1216,7 @@ private: } bool - Recv__delete__(const JS::AsmJSCacheResult& aResult) MOZ_OVERRIDE + Recv__delete__(const JS::AsmJSCacheResult& aResult) override { MOZ_ASSERT(!mFinished); mFinished = true; @@ -1231,7 +1231,7 @@ private: } void - ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE + ActorDestroy(ActorDestroyReason why) override { MOZ_ASSERT(!mActorDestroyed); mActorDestroyed = true; @@ -1253,7 +1253,7 @@ private: } void - OnOpenMetadataForRead(const Metadata& aMetadata) MOZ_OVERRIDE + OnOpenMetadataForRead(const Metadata& aMetadata) override { MOZ_ASSERT(NS_IsMainThread()); @@ -1263,21 +1263,21 @@ private: } bool - RecvSelectCacheFileToRead(const uint32_t& aModuleIndex) MOZ_OVERRIDE + RecvSelectCacheFileToRead(const uint32_t& aModuleIndex) override { MainProcessRunnable::OpenForRead(aModuleIndex); return true; } bool - RecvCacheMiss() MOZ_OVERRIDE + RecvCacheMiss() override { MainProcessRunnable::CacheMiss(); return true; } void - OnOpenCacheFile() MOZ_OVERRIDE + OnOpenCacheFile() override { MOZ_ASSERT(NS_IsMainThread()); @@ -1292,7 +1292,7 @@ private: } void - OnClose() MOZ_OVERRIDE MOZ_FINAL + OnClose() override final { MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(mOpened); @@ -1307,7 +1307,7 @@ private: } void - OnFailure(JS::AsmJSCacheResult aResult) MOZ_OVERRIDE + OnFailure(JS::AsmJSCacheResult aResult) override { MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(!mOpened); @@ -1356,7 +1356,7 @@ DeallocEntryParent(PAsmJSCacheEntryParent* aActor) namespace { -class ChildProcessRunnable MOZ_FINAL : public File, +class ChildProcessRunnable final : public File, public PAsmJSCacheEntryChild { public: @@ -1393,7 +1393,7 @@ protected: private: bool - RecvOnOpenMetadataForRead(const Metadata& aMetadata) MOZ_OVERRIDE + RecvOnOpenMetadataForRead(const Metadata& aMetadata) override { MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(mState == eOpening); @@ -1408,7 +1408,7 @@ private: bool RecvOnOpenCacheFile(const int64_t& aFileSize, - const FileDescriptor& aFileDesc) MOZ_OVERRIDE + const FileDescriptor& aFileDesc) override { MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(mState == eOpening); @@ -1426,7 +1426,7 @@ private: } bool - Recv__delete__(const JS::AsmJSCacheResult& aResult) MOZ_OVERRIDE + Recv__delete__(const JS::AsmJSCacheResult& aResult) override { MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(mState == eOpening); @@ -1436,14 +1436,14 @@ private: } void - ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE + ActorDestroy(ActorDestroyReason why) override { MOZ_ASSERT(NS_IsMainThread()); mActorDestroyed = true; } void - Close() MOZ_OVERRIDE MOZ_FINAL + Close() override final { MOZ_ASSERT(mState == eOpened); @@ -1750,13 +1750,13 @@ class Client : public quota::Client public: NS_IMETHOD_(MozExternalRefCountType) - AddRef() MOZ_OVERRIDE; + AddRef() override; NS_IMETHOD_(MozExternalRefCountType) - Release() MOZ_OVERRIDE; + Release() override; virtual Type - GetType() MOZ_OVERRIDE + GetType() override { return ASMJS; } @@ -1765,7 +1765,7 @@ public: InitOrigin(PersistenceType aPersistenceType, const nsACString& aGroup, const nsACString& aOrigin, - UsageInfo* aUsageInfo) MOZ_OVERRIDE + UsageInfo* aUsageInfo) override { if (!aUsageInfo) { return NS_OK; @@ -1777,7 +1777,7 @@ public: GetUsageForOrigin(PersistenceType aPersistenceType, const nsACString& aGroup, const nsACString& aOrigin, - UsageInfo* aUsageInfo) MOZ_OVERRIDE + UsageInfo* aUsageInfo) override { QuotaManager* qm = QuotaManager::Get(); MOZ_ASSERT(qm, "We were being called by the QuotaManager"); @@ -1826,34 +1826,34 @@ public: virtual void OnOriginClearCompleted(PersistenceType aPersistenceType, const nsACString& aOrigin) - MOZ_OVERRIDE + override { } virtual void - ReleaseIOThreadObjects() MOZ_OVERRIDE + ReleaseIOThreadObjects() override { } virtual bool - IsFileServiceUtilized() MOZ_OVERRIDE + IsFileServiceUtilized() override { return false; } virtual bool - IsTransactionServiceActivated() MOZ_OVERRIDE + IsTransactionServiceActivated() override { return false; } virtual void WaitForStoragesToComplete(nsTArray& aStorages, - nsIRunnable* aCallback) MOZ_OVERRIDE + nsIRunnable* aCallback) override { MOZ_ASSERT_UNREACHABLE("There are no storages"); } virtual void - ShutdownTransactionService() MOZ_OVERRIDE + ShutdownTransactionService() override { } private: diff --git a/dom/audiochannel/tests/TestAudioChannelService.cpp b/dom/audiochannel/tests/TestAudioChannelService.cpp index 238219847338..851f87239511 100644 --- a/dom/audiochannel/tests/TestAudioChannelService.cpp +++ b/dom/audiochannel/tests/TestAudioChannelService.cpp @@ -103,14 +103,14 @@ public: return mAgent->SetVisibilityState(visible); } - NS_IMETHODIMP CanPlayChanged(int32_t canPlay) MOZ_OVERRIDE + NS_IMETHODIMP CanPlayChanged(int32_t canPlay) override { mCanPlay = static_cast(canPlay); mWaitCallback = false; return NS_OK; } - NS_IMETHODIMP WindowVolumeChanged() MOZ_OVERRIDE + NS_IMETHODIMP WindowVolumeChanged() override { return NS_OK; } diff --git a/dom/base/AnonymousContent.h b/dom/base/AnonymousContent.h index ab7c78153618..d568bb30b741 100644 --- a/dom/base/AnonymousContent.h +++ b/dom/base/AnonymousContent.h @@ -17,7 +17,7 @@ namespace dom { class Element; -class AnonymousContent MOZ_FINAL +class AnonymousContent final { public: // Ref counting and cycle collection diff --git a/dom/base/Attr.h b/dom/base/Attr.h index a44c6c484269..3716c4ba66e6 100644 --- a/dom/base/Attr.h +++ b/dom/base/Attr.h @@ -28,7 +28,7 @@ namespace dom { // Attribute helper class used to wrap up an attribute with a dom // object that implements nsIDOMAttr and nsIDOMNode -class Attr MOZ_FINAL : public nsIAttribute, +class Attr final : public nsIAttribute, public nsIDOMAttr { virtual ~Attr() {} @@ -44,34 +44,34 @@ public: // nsIDOMNode interface NS_FORWARD_NSIDOMNODE_TO_NSINODE virtual void GetTextContentInternal(nsAString& aTextContent, - ErrorResult& aError) MOZ_OVERRIDE; + ErrorResult& aError) override; virtual void SetTextContentInternal(const nsAString& aTextContent, - ErrorResult& aError) MOZ_OVERRIDE; - virtual void GetNodeValueInternal(nsAString& aNodeValue) MOZ_OVERRIDE; + ErrorResult& aError) override; + virtual void GetNodeValueInternal(nsAString& aNodeValue) override; virtual void SetNodeValueInternal(const nsAString& aNodeValue, - ErrorResult& aError) MOZ_OVERRIDE; + ErrorResult& aError) override; // nsIDOMAttr interface NS_DECL_NSIDOMATTR - virtual nsresult PreHandleEvent(EventChainPreVisitor& aVisitor) MOZ_OVERRIDE; + virtual nsresult PreHandleEvent(EventChainPreVisitor& aVisitor) override; // nsIAttribute interface - void SetMap(nsDOMAttributeMap *aMap) MOZ_OVERRIDE; + void SetMap(nsDOMAttributeMap *aMap) override; Element* GetElement() const; - nsresult SetOwnerDocument(nsIDocument* aDocument) MOZ_OVERRIDE; + nsresult SetOwnerDocument(nsIDocument* aDocument) override; // nsINode interface - virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE; - virtual uint32_t GetChildCount() const MOZ_OVERRIDE; - virtual nsIContent *GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE; - virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const MOZ_OVERRIDE; - virtual int32_t IndexOf(const nsINode* aPossibleChild) const MOZ_OVERRIDE; + virtual bool IsNodeOfType(uint32_t aFlags) const override; + virtual uint32_t GetChildCount() const override; + virtual nsIContent *GetChildAt(uint32_t aIndex) const override; + virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const override; + virtual int32_t IndexOf(const nsINode* aPossibleChild) const override; virtual nsresult InsertChildAt(nsIContent* aKid, uint32_t aIndex, - bool aNotify) MOZ_OVERRIDE; - virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) MOZ_OVERRIDE; - virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE; - virtual already_AddRefed GetBaseURI(bool aTryUseXHRDocBaseURI = false) const MOZ_OVERRIDE; + bool aNotify) override; + virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) override; + virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const override; + virtual already_AddRefed GetBaseURI(bool aTryUseXHRDocBaseURI = false) const override; static void Initialize(); static void Shutdown(); @@ -79,10 +79,10 @@ public: NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS_AMBIGUOUS(Attr, nsIAttribute) - virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; } + virtual nsIDOMNode* AsDOMNode() override { return this; } // WebIDL - virtual JSObject* WrapNode(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapNode(JSContext* aCx, JS::Handle aGivenProto) override; // XPCOM GetName() is OK // XPCOM GetValue() is OK @@ -98,7 +98,7 @@ public: Element* GetOwnerElement(ErrorResult& aRv); protected: - virtual Element* GetNameSpaceElement() MOZ_OVERRIDE + virtual Element* GetNameSpaceElement() override { return GetElement(); } diff --git a/dom/base/BarProps.h b/dom/base/BarProps.h index 4b401ff2221b..5af80020962a 100644 --- a/dom/base/BarProps.h +++ b/dom/base/BarProps.h @@ -40,7 +40,7 @@ public: nsPIDOMWindow* GetParentObject() const; virtual JSObject* - WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; virtual bool GetVisible(ErrorResult& aRv) = 0; virtual void SetVisible(bool aVisible, ErrorResult& aRv) = 0; @@ -57,69 +57,69 @@ protected: }; // Script "menubar" object -class MenubarProp MOZ_FINAL : public BarProp +class MenubarProp final : public BarProp { public: explicit MenubarProp(nsGlobalWindow *aWindow); virtual ~MenubarProp(); - virtual bool GetVisible(ErrorResult& aRv) MOZ_OVERRIDE; - virtual void SetVisible(bool aVisible, ErrorResult& aRv) MOZ_OVERRIDE; + virtual bool GetVisible(ErrorResult& aRv) override; + virtual void SetVisible(bool aVisible, ErrorResult& aRv) override; }; // Script "toolbar" object -class ToolbarProp MOZ_FINAL : public BarProp +class ToolbarProp final : public BarProp { public: explicit ToolbarProp(nsGlobalWindow *aWindow); virtual ~ToolbarProp(); - virtual bool GetVisible(ErrorResult& aRv) MOZ_OVERRIDE; - virtual void SetVisible(bool aVisible, ErrorResult& aRv) MOZ_OVERRIDE; + virtual bool GetVisible(ErrorResult& aRv) override; + virtual void SetVisible(bool aVisible, ErrorResult& aRv) override; }; // Script "locationbar" object -class LocationbarProp MOZ_FINAL : public BarProp +class LocationbarProp final : public BarProp { public: explicit LocationbarProp(nsGlobalWindow *aWindow); virtual ~LocationbarProp(); - virtual bool GetVisible(ErrorResult& aRv) MOZ_OVERRIDE; - virtual void SetVisible(bool aVisible, ErrorResult& aRv) MOZ_OVERRIDE; + virtual bool GetVisible(ErrorResult& aRv) override; + virtual void SetVisible(bool aVisible, ErrorResult& aRv) override; }; // Script "personalbar" object -class PersonalbarProp MOZ_FINAL : public BarProp +class PersonalbarProp final : public BarProp { public: explicit PersonalbarProp(nsGlobalWindow *aWindow); virtual ~PersonalbarProp(); - virtual bool GetVisible(ErrorResult& aRv) MOZ_OVERRIDE; - virtual void SetVisible(bool aVisible, ErrorResult& aRv) MOZ_OVERRIDE; + virtual bool GetVisible(ErrorResult& aRv) override; + virtual void SetVisible(bool aVisible, ErrorResult& aRv) override; }; // Script "statusbar" object -class StatusbarProp MOZ_FINAL : public BarProp +class StatusbarProp final : public BarProp { public: explicit StatusbarProp(nsGlobalWindow *aWindow); virtual ~StatusbarProp(); - virtual bool GetVisible(ErrorResult& aRv) MOZ_OVERRIDE; - virtual void SetVisible(bool aVisible, ErrorResult& aRv) MOZ_OVERRIDE; + virtual bool GetVisible(ErrorResult& aRv) override; + virtual void SetVisible(bool aVisible, ErrorResult& aRv) override; }; // Script "scrollbars" object -class ScrollbarsProp MOZ_FINAL : public BarProp +class ScrollbarsProp final : public BarProp { public: explicit ScrollbarsProp(nsGlobalWindow *aWindow); virtual ~ScrollbarsProp(); - virtual bool GetVisible(ErrorResult& aRv) MOZ_OVERRIDE; - virtual void SetVisible(bool aVisible, ErrorResult& aRv) MOZ_OVERRIDE; + virtual bool GetVisible(ErrorResult& aRv) override; + virtual void SetVisible(bool aVisible, ErrorResult& aRv) override; }; } // namespace dom diff --git a/dom/base/Comment.h b/dom/base/Comment.h index 15aa1e6179fe..572169704cd6 100644 --- a/dom/base/Comment.h +++ b/dom/base/Comment.h @@ -13,7 +13,7 @@ namespace mozilla { namespace dom { -class Comment MOZ_FINAL : public nsGenericDOMDataNode, +class Comment final : public nsGenericDOMDataNode, public nsIDOMComment { private: @@ -52,16 +52,16 @@ public: // Empty interface // nsINode - virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE; + virtual bool IsNodeOfType(uint32_t aFlags) const override; virtual nsGenericDOMDataNode* CloneDataNode(mozilla::dom::NodeInfo *aNodeInfo, - bool aCloneText) const MOZ_OVERRIDE; + bool aCloneText) const override; - virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; } + virtual nsIDOMNode* AsDOMNode() override { return this; } #ifdef DEBUG - virtual void List(FILE* out, int32_t aIndent) const MOZ_OVERRIDE; + virtual void List(FILE* out, int32_t aIndent) const override; virtual void DumpContent(FILE* out = stdout, int32_t aIndent = 0, - bool aDumpAll = true) const MOZ_OVERRIDE + bool aDumpAll = true) const override { return; } @@ -72,7 +72,7 @@ public: ErrorResult& aRv); protected: - virtual JSObject* WrapNode(JSContext *aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapNode(JSContext *aCx, JS::Handle aGivenProto) override; }; } // namespace dom diff --git a/dom/base/Console.cpp b/dom/base/Console.cpp index c1f63ed1151e..89502d9301f5 100644 --- a/dom/base/Console.cpp +++ b/dom/base/Console.cpp @@ -148,7 +148,7 @@ static const JSStructuredCloneCallbacks gConsoleCallbacks = { ConsoleStructuredCloneCallbacksError }; -class ConsoleCallData MOZ_FINAL +class ConsoleCallData final { public: ConsoleCallData() @@ -394,7 +394,7 @@ private: // This runnable appends a CallData object into the Console queue running on // the main-thread. -class ConsoleCallDataRunnable MOZ_FINAL : public ConsoleRunnable +class ConsoleCallDataRunnable final : public ConsoleRunnable { public: ConsoleCallDataRunnable(Console* aConsole, @@ -408,7 +408,7 @@ private: { } bool - PreDispatch(JSContext* aCx) MOZ_OVERRIDE + PreDispatch(JSContext* aCx) override { mWorkerPrivate->AssertIsOnWorkerThread(); @@ -441,7 +441,7 @@ private: void RunConsole(JSContext* aCx, nsPIDOMWindow* aOuterWindow, - nsPIDOMWindow* aInnerWindow) MOZ_OVERRIDE + nsPIDOMWindow* aInnerWindow) override { MOZ_ASSERT(NS_IsMainThread()); @@ -520,7 +520,7 @@ private: }; // This runnable calls ProfileMethod() on the console on the main-thread. -class ConsoleProfileRunnable MOZ_FINAL : public ConsoleRunnable +class ConsoleProfileRunnable final : public ConsoleRunnable { public: ConsoleProfileRunnable(Console* aConsole, const nsAString& aAction, @@ -534,7 +534,7 @@ public: private: bool - PreDispatch(JSContext* aCx) MOZ_OVERRIDE + PreDispatch(JSContext* aCx) override { ClearException ce(aCx); @@ -570,7 +570,7 @@ private: void RunConsole(JSContext* aCx, nsPIDOMWindow* aOuterWindow, - nsPIDOMWindow* aInnerWindow) MOZ_OVERRIDE + nsPIDOMWindow* aInnerWindow) override { ClearException ce(aCx); @@ -934,7 +934,7 @@ public: } } - virtual bool Equals(const TimelineMarker* aOther) MOZ_OVERRIDE + virtual bool Equals(const TimelineMarker* aOther) override { if (!TimelineMarker::Equals(aOther)) { return false; @@ -943,7 +943,7 @@ public: return GetCause() == aOther->GetCause(); } - virtual void AddDetails(mozilla::dom::ProfileTimelineMarker& aMarker) MOZ_OVERRIDE + virtual void AddDetails(mozilla::dom::ProfileTimelineMarker& aMarker) override { if (GetMetaData() == TRACING_INTERVAL_START) { aMarker.mCauseName.Construct(GetCause()); diff --git a/dom/base/Console.h b/dom/base/Console.h index 64d083409bbd..67ca8ff35956 100644 --- a/dom/base/Console.h +++ b/dom/base/Console.h @@ -25,7 +25,7 @@ namespace dom { class ConsoleCallData; struct ConsoleStackEntry; -class Console MOZ_FINAL : public nsIObserver +class Console final : public nsIObserver , public nsWrapperCache { ~Console(); @@ -44,7 +44,7 @@ public: } virtual JSObject* - WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; void Log(JSContext* aCx, const Sequence& aData); diff --git a/dom/base/Crypto.h b/dom/base/Crypto.h index 56ac96d5b278..924e985f1d1e 100644 --- a/dom/base/Crypto.h +++ b/dom/base/Crypto.h @@ -50,7 +50,7 @@ public: } virtual JSObject* - WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; static uint8_t* GetRandomValues(uint32_t aLength); diff --git a/dom/base/DOMCursor.h b/dom/base/DOMCursor.h index f55177a17c7b..1f1bd20579f4 100644 --- a/dom/base/DOMCursor.h +++ b/dom/base/DOMCursor.h @@ -27,7 +27,7 @@ public: DOMCursor(nsPIDOMWindow* aWindow, nsICursorContinueCallback *aCallback); - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; bool Done() const { diff --git a/dom/base/DOMError.h b/dom/base/DOMError.h index 1d32f4333157..8e3697a55af4 100644 --- a/dom/base/DOMError.h +++ b/dom/base/DOMError.h @@ -59,7 +59,7 @@ public: } virtual JSObject* - WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; static already_AddRefed Constructor(const GlobalObject& global, const nsAString& name, diff --git a/dom/base/DOMException.h b/dom/base/DOMException.h index 5e1edb56a751..0b1c02d00708 100644 --- a/dom/base/DOMException.h +++ b/dom/base/DOMException.h @@ -64,7 +64,7 @@ public: // WebIDL API virtual JSObject* WrapObject(JSContext* cx, JS::Handle aGivenProto) - MOZ_OVERRIDE; + override; nsISupports* GetParentObject() const { return nullptr; } @@ -133,11 +133,11 @@ public: NS_DECL_NSIDOMDOMEXCEPTION // nsIException overrides - NS_IMETHOD ToString(nsACString& aReturn) MOZ_OVERRIDE; + NS_IMETHOD ToString(nsACString& aReturn) override; // nsWrapperCache overrides virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) - MOZ_OVERRIDE; + override; static already_AddRefed Constructor(GlobalObject& /* unused */, diff --git a/dom/base/DOMImplementation.h b/dom/base/DOMImplementation.h index 284c153d6ddb..4cbf44fa27ec 100644 --- a/dom/base/DOMImplementation.h +++ b/dom/base/DOMImplementation.h @@ -24,7 +24,7 @@ namespace mozilla { namespace dom { class DocumentType; -class DOMImplementation MOZ_FINAL : public nsIDOMDOMImplementation +class DOMImplementation final : public nsIDOMDOMImplementation , public nsWrapperCache { ~DOMImplementation() @@ -52,7 +52,7 @@ public: return mOwner; } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; // nsIDOMDOMImplementation NS_DECL_NSIDOMDOMIMPLEMENTATION diff --git a/dom/base/DOMMatrix.h b/dom/base/DOMMatrix.h index 5e815a5714e5..7802f17fb638 100644 --- a/dom/base/DOMMatrix.h +++ b/dom/base/DOMMatrix.h @@ -141,7 +141,7 @@ private: DOMMatrixReadOnly& operator=(const DOMMatrixReadOnly&) = delete; }; -class DOMMatrix MOZ_FINAL : public DOMMatrixReadOnly +class DOMMatrix final : public DOMMatrixReadOnly { public: explicit DOMMatrix(nsISupports* aParent) @@ -166,7 +166,7 @@ public: Constructor(const GlobalObject& aGlobal, const Sequence& aNumberSequence, ErrorResult& aRv); nsISupports* GetParentObject() const { return mParent; } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; #define Set2DMatrixMember(entry2D, entry3D) \ { \ diff --git a/dom/base/DOMParser.h b/dom/base/DOMParser.h index afe69546b863..9ee16934c6ce 100644 --- a/dom/base/DOMParser.h +++ b/dom/base/DOMParser.h @@ -20,7 +20,7 @@ class nsIDocument; namespace mozilla { namespace dom { -class DOMParser MOZ_FINAL : public nsIDOMParser, +class DOMParser final : public nsIDOMParser, public nsSupportsWeakReference, public nsWrapperCache { @@ -75,7 +75,7 @@ public: return mOwner; } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { return mozilla::dom::DOMParserBinding::Wrap(aCx, this, aGivenProto); } diff --git a/dom/base/DOMPoint.h b/dom/base/DOMPoint.h index 8a12a3c24c99..d9213293b02c 100644 --- a/dom/base/DOMPoint.h +++ b/dom/base/DOMPoint.h @@ -48,7 +48,7 @@ protected: double mX, mY, mZ, mW; }; -class DOMPoint MOZ_FINAL : public DOMPointReadOnly +class DOMPoint final : public DOMPointReadOnly { public: explicit DOMPoint(nsISupports* aParent, double aX = 0.0, double aY = 0.0, @@ -64,7 +64,7 @@ public: double aZ, double aW, ErrorResult& aRV); nsISupports* GetParentObject() const { return mParent; } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; void SetX(double aX) { mX = aX; } void SetY(double aY) { mY = aY; } diff --git a/dom/base/DOMQuad.cpp b/dom/base/DOMQuad.cpp index 735fc2c650de..de25b5d42d60 100644 --- a/dom/base/DOMQuad.cpp +++ b/dom/base/DOMQuad.cpp @@ -73,7 +73,7 @@ DOMQuad::Constructor(const GlobalObject& aGlobal, const DOMRectReadOnly& aRect, return obj.forget(); } -class DOMQuad::QuadBounds MOZ_FINAL : public DOMRectReadOnly +class DOMQuad::QuadBounds final : public DOMRectReadOnly { public: explicit QuadBounds(DOMQuad* aQuad) @@ -84,25 +84,25 @@ public: NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(QuadBounds, DOMRectReadOnly) NS_DECL_ISUPPORTS_INHERITED - virtual double X() const MOZ_OVERRIDE + virtual double X() const override { double x1, x2; GetHorizontalMinMax(&x1, &x2); return x1; } - virtual double Y() const MOZ_OVERRIDE + virtual double Y() const override { double y1, y2; GetVerticalMinMax(&y1, &y2); return y1; } - virtual double Width() const MOZ_OVERRIDE + virtual double Width() const override { double x1, x2; GetHorizontalMinMax(&x1, &x2); return x2 - x1; } - virtual double Height() const MOZ_OVERRIDE + virtual double Height() const override { double y1, y2; GetVerticalMinMax(&y1, &y2); diff --git a/dom/base/DOMQuad.h b/dom/base/DOMQuad.h index b5f22b96da30..9fcb1412cb71 100644 --- a/dom/base/DOMQuad.h +++ b/dom/base/DOMQuad.h @@ -23,7 +23,7 @@ class DOMRectReadOnly; class DOMPoint; struct DOMPointInit; -class DOMQuad MOZ_FINAL : public nsWrapperCache +class DOMQuad final : public nsWrapperCache { ~DOMQuad(); @@ -35,7 +35,7 @@ public: NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(DOMQuad) nsISupports* GetParentObject() const { return mParent; } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; static already_AddRefed Constructor(const GlobalObject& aGlobal, diff --git a/dom/base/DOMRect.h b/dom/base/DOMRect.h index 501e17d1bee4..fb7dfaeff1ee 100644 --- a/dom/base/DOMRect.h +++ b/dom/base/DOMRect.h @@ -43,7 +43,7 @@ public: MOZ_ASSERT(mParent); return mParent; } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; virtual double X() const = 0; virtual double Y() const = 0; @@ -75,7 +75,7 @@ protected: nsCOMPtr mParent; }; -class DOMRect MOZ_FINAL : public DOMRectReadOnly +class DOMRect final : public DOMRectReadOnly , public nsIDOMClientRect { public: @@ -98,26 +98,26 @@ public: Constructor(const GlobalObject& aGlobal, double aX, double aY, double aWidth, double aHeight, ErrorResult& aRV); - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; void SetRect(float aX, float aY, float aWidth, float aHeight) { mX = aX; mY = aY; mWidth = aWidth; mHeight = aHeight; } void SetLayoutRect(const nsRect& aLayoutRect); - virtual double X() const MOZ_OVERRIDE + virtual double X() const override { return mX; } - virtual double Y() const MOZ_OVERRIDE + virtual double Y() const override { return mY; } - virtual double Width() const MOZ_OVERRIDE + virtual double Width() const override { return mWidth; } - virtual double Height() const MOZ_OVERRIDE + virtual double Height() const override { return mHeight; } @@ -146,7 +146,7 @@ private: ~DOMRect() {}; }; -class DOMRectList MOZ_FINAL : public nsIDOMClientRectList, +class DOMRectList final : public nsIDOMClientRectList, public nsWrapperCache { ~DOMRectList() {} @@ -161,7 +161,7 @@ public: NS_DECL_NSIDOMCLIENTRECTLIST - virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) override; nsISupports* GetParentObject() { diff --git a/dom/base/DOMRequest.h b/dom/base/DOMRequest.h index cb2cf462a26a..c631fcd50871 100644 --- a/dom/base/DOMRequest.h +++ b/dom/base/DOMRequest.h @@ -47,7 +47,7 @@ public: return GetOwner(); } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; // WebIDL Interface DOMRequestReadyState ReadyState() const @@ -93,7 +93,7 @@ protected: void RootResultVal(); }; -class DOMRequestService MOZ_FINAL : public nsIDOMRequestService +class DOMRequestService final : public nsIDOMRequestService { ~DOMRequestService() {} diff --git a/dom/base/DOMStringList.h b/dom/base/DOMStringList.h index b6c5b2c968e9..f0d47dd4c6ab 100644 --- a/dom/base/DOMStringList.h +++ b/dom/base/DOMStringList.h @@ -24,7 +24,7 @@ public: NS_DECL_CYCLE_COLLECTING_ISUPPORTS NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMStringList) - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; nsISupports* GetParentObject() { return nullptr; diff --git a/dom/base/DocumentFragment.h b/dom/base/DocumentFragment.h index 9877b4145ed8..6c3f0018ad9d 100644 --- a/dom/base/DocumentFragment.h +++ b/dom/base/DocumentFragment.h @@ -65,7 +65,7 @@ public: Init(); } - virtual JSObject* WrapNode(JSContext *aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapNode(JSContext *aCx, JS::Handle aGivenProto) override; // nsIContent nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName, @@ -75,43 +75,43 @@ public: } virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName, nsIAtom* aPrefix, const nsAString& aValue, - bool aNotify) MOZ_OVERRIDE + bool aNotify) override { return NS_OK; } virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute, - bool aNotify) MOZ_OVERRIDE + bool aNotify) override { return NS_OK; } - virtual const nsAttrName* GetAttrNameAt(uint32_t aIndex) const MOZ_OVERRIDE + virtual const nsAttrName* GetAttrNameAt(uint32_t aIndex) const override { return nullptr; } - virtual uint32_t GetAttrCount() const MOZ_OVERRIDE + virtual uint32_t GetAttrCount() const override { return 0; } - virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE; + virtual bool IsNodeOfType(uint32_t aFlags) const override; - virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; } + virtual nsIDOMNode* AsDOMNode() override { return this; } virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent, nsIContent* aBindingParent, - bool aCompileEventHandlers) MOZ_OVERRIDE + bool aCompileEventHandlers) override { NS_ASSERTION(false, "Trying to bind a fragment to a tree"); return NS_ERROR_NOT_IMPLEMENTED; } - virtual void UnbindFromTree(bool aDeep, bool aNullParent) MOZ_OVERRIDE + virtual void UnbindFromTree(bool aDeep, bool aNullParent) override { NS_ASSERTION(false, "Trying to unbind a fragment from a tree"); return; } - virtual Element* GetNameSpaceElement() MOZ_OVERRIDE + virtual Element* GetNameSpaceElement() override { return nullptr; } @@ -130,8 +130,8 @@ public: Constructor(const GlobalObject& aGlobal, ErrorResult& aRv); #ifdef DEBUG - virtual void List(FILE* out, int32_t aIndent) const MOZ_OVERRIDE; - virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const MOZ_OVERRIDE; + virtual void List(FILE* out, int32_t aIndent) const override; + virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const override; #endif protected: @@ -139,7 +139,7 @@ protected: { } - nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE; + nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const override; nsIContent* mHost; // Weak }; diff --git a/dom/base/DocumentType.h b/dom/base/DocumentType.h index defb5ed51a3f..fece250363db 100644 --- a/dom/base/DocumentType.h +++ b/dom/base/DocumentType.h @@ -38,7 +38,7 @@ public: NS_FORWARD_NSIDOMNODE_TO_NSINODE }; -class DocumentType MOZ_FINAL : public DocumentTypeForward +class DocumentType final : public DocumentTypeForward { public: DocumentType(already_AddRefed& aNodeInfo, @@ -56,28 +56,28 @@ public: NS_DECL_NSIDOMDOCUMENTTYPE // nsINode - virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE; - virtual void GetNodeValueInternal(nsAString& aNodeValue) MOZ_OVERRIDE + virtual bool IsNodeOfType(uint32_t aFlags) const override; + virtual void GetNodeValueInternal(nsAString& aNodeValue) override { SetDOMStringToNull(aNodeValue); } virtual void SetNodeValueInternal(const nsAString& aNodeValue, - mozilla::ErrorResult& aError) MOZ_OVERRIDE + mozilla::ErrorResult& aError) override { } // nsIContent overrides - virtual const nsTextFragment* GetText() MOZ_OVERRIDE; + virtual const nsTextFragment* GetText() override; virtual nsGenericDOMDataNode* CloneDataNode(mozilla::dom::NodeInfo *aNodeInfo, - bool aCloneText) const MOZ_OVERRIDE; + bool aCloneText) const override; - virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; } + virtual nsIDOMNode* AsDOMNode() override { return this; } protected: virtual ~DocumentType(); - virtual JSObject* WrapNode(JSContext *cx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapNode(JSContext *cx, JS::Handle aGivenProto) override; nsString mPublicId; nsString mSystemId; diff --git a/dom/base/Element.h b/dom/base/Element.h index 6e5277f77045..8044541db0ce 100644 --- a/dom/base/Element.h +++ b/dom/base/Element.h @@ -149,7 +149,7 @@ public: NS_DECLARE_STATIC_IID_ACCESSOR(NS_ELEMENT_IID) - NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) MOZ_OVERRIDE; + NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) override; /** * Method to get the full state of this element. See mozilla/EventStates.h @@ -424,13 +424,13 @@ protected: NotifyStateChange(aStates); } public: - virtual void UpdateEditableState(bool aNotify) MOZ_OVERRIDE; + virtual void UpdateEditableState(bool aNotify) override; virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent, nsIContent* aBindingParent, - bool aCompileEventHandlers) MOZ_OVERRIDE; + bool aCompileEventHandlers) override; virtual void UnbindFromTree(bool aDeep = true, - bool aNullParent = true) MOZ_OVERRIDE; + bool aNullParent = true) override; /** * Normalizes an attribute name and returns it as a nodeinfo if an attribute @@ -480,7 +480,7 @@ public: uint8_t* aModType, bool* aHasListeners); virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName, nsIAtom* aPrefix, - const nsAString& aValue, bool aNotify) MOZ_OVERRIDE; + const nsAString& aValue, bool aNotify) override; nsresult SetParsedAttr(int32_t aNameSpaceID, nsIAtom* aName, nsIAtom* aPrefix, nsAttrValue& aParsedValue, bool aNotify); // GetAttr is not inlined on purpose, to keep down codesize from all @@ -498,24 +498,24 @@ public: virtual int32_t FindAttrValueIn(int32_t aNameSpaceID, nsIAtom* aName, AttrValuesArray* aValues, - nsCaseTreatment aCaseSensitive) const MOZ_OVERRIDE; + nsCaseTreatment aCaseSensitive) const override; virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute, - bool aNotify) MOZ_OVERRIDE; - virtual const nsAttrName* GetAttrNameAt(uint32_t aIndex) const MOZ_OVERRIDE; - virtual uint32_t GetAttrCount() const MOZ_OVERRIDE; - virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE; + bool aNotify) override; + virtual const nsAttrName* GetAttrNameAt(uint32_t aIndex) const override; + virtual uint32_t GetAttrCount() const override; + virtual bool IsNodeOfType(uint32_t aFlags) const override; #ifdef DEBUG - virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE + virtual void List(FILE* out = stdout, int32_t aIndent = 0) const override { List(out, aIndent, EmptyCString()); } - virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const MOZ_OVERRIDE; + virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const override; void List(FILE* out, int32_t aIndent, const nsCString& aPrefix) const; void ListAttributes(FILE* out) const; #endif - void Describe(nsAString& aOutDescription) const MOZ_OVERRIDE; + void Describe(nsAString& aOutDescription) const override; /* * Attribute Mapping Helpers @@ -960,9 +960,9 @@ public: nsIDOMHTMLCollection** aResult); void GetClassList(nsISupports** aClassList); - virtual JSObject* WrapObject(JSContext *aCx, JS::Handle aGivenProto) MOZ_FINAL MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext *aCx, JS::Handle aGivenProto) final override; - nsINode* GetScopeChainParent() const MOZ_OVERRIDE; + nsINode* GetScopeChainParent() const override; /** * Locate an nsIEditor rooted at this content node, if there is one. @@ -1211,7 +1211,7 @@ protected: nsIFrame* GetStyledFrame(); - virtual Element* GetNameSpaceElement() MOZ_OVERRIDE + virtual Element* GetNameSpaceElement() override { return this; } @@ -1291,7 +1291,7 @@ public: nsIContent* aContent, nsIDocument* aDoc); - NS_IMETHOD Run() MOZ_OVERRIDE; + NS_IMETHOD Run() override; private: virtual ~RemoveFromBindingManagerRunnable(); nsRefPtr mManager; @@ -1311,11 +1311,11 @@ public: NS_DECL_NSIDOMNODELIST // nsINodeList - virtual nsIContent* Item(uint32_t aIndex) MOZ_OVERRIDE; - virtual int32_t IndexOf(nsIContent* aContent) MOZ_OVERRIDE; - virtual nsINode* GetParentObject() MOZ_OVERRIDE { return mParent; } + virtual nsIContent* Item(uint32_t aIndex) override; + virtual int32_t IndexOf(nsIContent* aContent) override; + virtual nsINode* GetParentObject() override { return mParent; } virtual uint32_t Length() const; - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; protected: virtual ~DestinationInsertionPointList(); @@ -1467,45 +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 MOZ_OVERRIDE \ +NS_IMETHOD GetTagName(nsAString& aTagName) final override \ { \ Element::GetTagName(aTagName); \ return NS_OK; \ } \ -NS_IMETHOD GetId(nsAString& aId) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD GetId(nsAString& aId) final override \ { \ Element::GetId(aId); \ return NS_OK; \ } \ -NS_IMETHOD SetId(const nsAString& aId) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD SetId(const nsAString& aId) final override \ { \ Element::SetId(aId); \ return NS_OK; \ } \ -NS_IMETHOD GetClassName(nsAString& aClassName) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD GetClassName(nsAString& aClassName) final override \ { \ Element::GetClassName(aClassName); \ return NS_OK; \ } \ -NS_IMETHOD SetClassName(const nsAString& aClassName) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD SetClassName(const nsAString& aClassName) final override \ { \ Element::SetClassName(aClassName); \ return NS_OK; \ } \ -NS_IMETHOD GetClassList(nsISupports** aClassList) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD GetClassList(nsISupports** aClassList) final override \ { \ Element::GetClassList(aClassList); \ return NS_OK; \ } \ -NS_IMETHOD GetAttributes(nsIDOMMozNamedAttrMap** aAttributes) MOZ_FINAL \ - MOZ_OVERRIDE \ +NS_IMETHOD GetAttributes(nsIDOMMozNamedAttrMap** aAttributes) final \ + override \ { \ NS_ADDREF(*aAttributes = Attributes()); \ return NS_OK; \ } \ using Element::GetAttribute; \ -NS_IMETHOD GetAttribute(const nsAString& name, nsAString& _retval) MOZ_FINAL \ - MOZ_OVERRIDE \ +NS_IMETHOD GetAttribute(const nsAString& name, nsAString& _retval) final \ + override \ { \ nsString attr; \ GetAttribute(name, attr); \ @@ -1514,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 MOZ_OVERRIDE \ + nsAString& _retval) final override \ { \ Element::GetAttributeNS(namespaceURI, localName, _retval); \ return NS_OK; \ } \ NS_IMETHOD SetAttribute(const nsAString& name, \ - const nsAString& value) MOZ_OVERRIDE \ + const nsAString& value) override \ { \ mozilla::ErrorResult rv; \ Element::SetAttribute(name, value, rv); \ @@ -1528,22 +1528,22 @@ NS_IMETHOD SetAttribute(const nsAString& name, \ } \ NS_IMETHOD SetAttributeNS(const nsAString& namespaceURI, \ const nsAString& qualifiedName, \ - const nsAString& value) MOZ_FINAL MOZ_OVERRIDE \ + const nsAString& value) final override \ { \ mozilla::ErrorResult rv; \ Element::SetAttributeNS(namespaceURI, qualifiedName, value, rv); \ return rv.ErrorCode(); \ } \ using Element::RemoveAttribute; \ -NS_IMETHOD RemoveAttribute(const nsAString& name) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD RemoveAttribute(const nsAString& name) final override \ { \ mozilla::ErrorResult rv; \ RemoveAttribute(name, rv); \ return rv.ErrorCode(); \ } \ NS_IMETHOD RemoveAttributeNS(const nsAString& namespaceURI, \ - const nsAString& localName) MOZ_FINAL \ - MOZ_OVERRIDE \ + const nsAString& localName) final \ + override \ { \ mozilla::ErrorResult rv; \ Element::RemoveAttributeNS(namespaceURI, localName, rv); \ @@ -1551,31 +1551,31 @@ NS_IMETHOD RemoveAttributeNS(const nsAString& namespaceURI, \ } \ using Element::HasAttribute; \ NS_IMETHOD HasAttribute(const nsAString& name, \ - bool* _retval) MOZ_FINAL MOZ_OVERRIDE \ + bool* _retval) final override \ { \ *_retval = HasAttribute(name); \ return NS_OK; \ } \ NS_IMETHOD HasAttributeNS(const nsAString& namespaceURI, \ const nsAString& localName, \ - bool* _retval) MOZ_FINAL MOZ_OVERRIDE \ + bool* _retval) final override \ { \ *_retval = Element::HasAttributeNS(namespaceURI, localName); \ return NS_OK; \ } \ -NS_IMETHOD HasAttributes(bool* _retval) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD HasAttributes(bool* _retval) final override \ { \ *_retval = Element::HasAttributes(); \ return NS_OK; \ } \ NS_IMETHOD GetAttributeNode(const nsAString& name, \ - nsIDOMAttr** _retval) MOZ_FINAL MOZ_OVERRIDE \ + nsIDOMAttr** _retval) final override \ { \ NS_IF_ADDREF(*_retval = Element::GetAttributeNode(name)); \ return NS_OK; \ } \ NS_IMETHOD SetAttributeNode(nsIDOMAttr* newAttr, \ - nsIDOMAttr** _retval) MOZ_FINAL MOZ_OVERRIDE \ + nsIDOMAttr** _retval) final override \ { \ if (!newAttr) { \ return NS_ERROR_INVALID_POINTER; \ @@ -1586,7 +1586,7 @@ NS_IMETHOD SetAttributeNode(nsIDOMAttr* newAttr, \ return rv.ErrorCode(); \ } \ NS_IMETHOD RemoveAttributeNode(nsIDOMAttr* oldAttr, \ - nsIDOMAttr** _retval) MOZ_FINAL MOZ_OVERRIDE \ + nsIDOMAttr** _retval) final override \ { \ if (!oldAttr) { \ return NS_ERROR_INVALID_POINTER; \ @@ -1598,14 +1598,14 @@ NS_IMETHOD RemoveAttributeNode(nsIDOMAttr* oldAttr, \ } \ NS_IMETHOD GetAttributeNodeNS(const nsAString& namespaceURI, \ const nsAString& localName, \ - nsIDOMAttr** _retval) MOZ_FINAL MOZ_OVERRIDE \ + nsIDOMAttr** _retval) final override \ { \ NS_IF_ADDREF(*_retval = Element::GetAttributeNodeNS(namespaceURI, \ localName)); \ return NS_OK; \ } \ NS_IMETHOD SetAttributeNodeNS(nsIDOMAttr* newAttr, \ - nsIDOMAttr** _retval) MOZ_FINAL MOZ_OVERRIDE \ + nsIDOMAttr** _retval) final override \ { \ mozilla::ErrorResult rv; \ mozilla::dom::Attr* attr = static_cast(newAttr); \ @@ -1613,34 +1613,34 @@ NS_IMETHOD SetAttributeNodeNS(nsIDOMAttr* newAttr, \ return rv.ErrorCode(); \ } \ NS_IMETHOD GetElementsByTagName(const nsAString& name, \ - nsIDOMHTMLCollection** _retval) MOZ_FINAL \ - MOZ_OVERRIDE \ + nsIDOMHTMLCollection** _retval) final \ + override \ { \ Element::GetElementsByTagName(name, _retval); \ return NS_OK; \ } \ NS_IMETHOD GetElementsByTagNameNS(const nsAString& namespaceURI, \ const nsAString& localName, \ - nsIDOMHTMLCollection** _retval) MOZ_FINAL \ - MOZ_OVERRIDE\ + nsIDOMHTMLCollection** _retval) final \ + override\ { \ return Element::GetElementsByTagNameNS(namespaceURI, localName, \ _retval); \ } \ NS_IMETHOD GetElementsByClassName(const nsAString& classes, \ - nsIDOMHTMLCollection** _retval) MOZ_FINAL \ - MOZ_OVERRIDE\ + nsIDOMHTMLCollection** _retval) final \ + override\ { \ return Element::GetElementsByClassName(classes, _retval); \ } \ -NS_IMETHOD GetChildElements(nsIDOMNodeList** aChildElements) MOZ_FINAL \ - MOZ_OVERRIDE \ +NS_IMETHOD GetChildElements(nsIDOMNodeList** aChildElements) final \ + override \ { \ nsIHTMLCollection* list = FragmentOrElement::Children(); \ return CallQueryInterface(list, aChildElements); \ } \ -NS_IMETHOD GetFirstElementChild(nsIDOMElement** aFirstElementChild) MOZ_FINAL \ - MOZ_OVERRIDE \ +NS_IMETHOD GetFirstElementChild(nsIDOMElement** aFirstElementChild) final \ + override \ { \ Element* element = Element::GetFirstElementChild(); \ if (!element) { \ @@ -1649,8 +1649,8 @@ NS_IMETHOD GetFirstElementChild(nsIDOMElement** aFirstElementChild) MOZ_FINAL \ } \ return CallQueryInterface(element, aFirstElementChild); \ } \ -NS_IMETHOD GetLastElementChild(nsIDOMElement** aLastElementChild) MOZ_FINAL \ - MOZ_OVERRIDE \ +NS_IMETHOD GetLastElementChild(nsIDOMElement** aLastElementChild) final \ + override \ { \ Element* element = Element::GetLastElementChild(); \ if (!element) { \ @@ -1660,7 +1660,7 @@ NS_IMETHOD GetLastElementChild(nsIDOMElement** aLastElementChild) MOZ_FINAL \ return CallQueryInterface(element, aLastElementChild); \ } \ NS_IMETHOD GetPreviousElementSibling(nsIDOMElement** aPreviousElementSibling) \ - MOZ_FINAL MOZ_OVERRIDE \ + final override \ { \ Element* element = Element::GetPreviousElementSibling(); \ if (!element) { \ @@ -1670,7 +1670,7 @@ NS_IMETHOD GetPreviousElementSibling(nsIDOMElement** aPreviousElementSibling) \ return CallQueryInterface(element, aPreviousElementSibling); \ } \ NS_IMETHOD GetNextElementSibling(nsIDOMElement** aNextElementSibling) \ - MOZ_FINAL MOZ_OVERRIDE \ + final override \ { \ Element* element = Element::GetNextElementSibling(); \ if (!element) { \ @@ -1679,126 +1679,126 @@ NS_IMETHOD GetNextElementSibling(nsIDOMElement** aNextElementSibling) \ } \ return CallQueryInterface(element, aNextElementSibling); \ } \ -NS_IMETHOD GetChildElementCount(uint32_t* aChildElementCount) MOZ_FINAL \ - MOZ_OVERRIDE \ +NS_IMETHOD GetChildElementCount(uint32_t* aChildElementCount) final \ + override \ { \ *aChildElementCount = Element::ChildElementCount(); \ return NS_OK; \ } \ -NS_IMETHOD MozRemove() MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD MozRemove() final override \ { \ nsINode::Remove(); \ return NS_OK; \ } \ -NS_IMETHOD GetClientRects(nsIDOMClientRectList** _retval) MOZ_FINAL \ - MOZ_OVERRIDE \ +NS_IMETHOD GetClientRects(nsIDOMClientRectList** _retval) final \ + override \ { \ *_retval = Element::GetClientRects().take(); \ return NS_OK; \ } \ -NS_IMETHOD GetBoundingClientRect(nsIDOMClientRect** _retval) MOZ_FINAL \ - MOZ_OVERRIDE \ +NS_IMETHOD GetBoundingClientRect(nsIDOMClientRect** _retval) final \ + override \ { \ *_retval = Element::GetBoundingClientRect().take(); \ return NS_OK; \ } \ -NS_IMETHOD GetScrollTop(int32_t* aScrollTop) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD GetScrollTop(int32_t* aScrollTop) final override \ { \ *aScrollTop = Element::ScrollTop(); \ return NS_OK; \ } \ -NS_IMETHOD SetScrollTop(int32_t aScrollTop) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD SetScrollTop(int32_t aScrollTop) final override \ { \ Element::SetScrollTop(aScrollTop); \ return NS_OK; \ } \ -NS_IMETHOD GetScrollLeft(int32_t* aScrollLeft) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD GetScrollLeft(int32_t* aScrollLeft) final override \ { \ *aScrollLeft = Element::ScrollLeft(); \ return NS_OK; \ } \ -NS_IMETHOD SetScrollLeft(int32_t aScrollLeft) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD SetScrollLeft(int32_t aScrollLeft) final override \ { \ Element::SetScrollLeft(aScrollLeft); \ return NS_OK; \ } \ -NS_IMETHOD GetScrollWidth(int32_t* aScrollWidth) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD GetScrollWidth(int32_t* aScrollWidth) final override \ { \ *aScrollWidth = Element::ScrollWidth(); \ return NS_OK; \ } \ -NS_IMETHOD GetScrollHeight(int32_t* aScrollHeight) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD GetScrollHeight(int32_t* aScrollHeight) final override \ { \ *aScrollHeight = Element::ScrollHeight(); \ return NS_OK; \ } \ -NS_IMETHOD GetClientTop(int32_t* aClientTop) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD GetClientTop(int32_t* aClientTop) final override \ { \ *aClientTop = Element::ClientTop(); \ return NS_OK; \ } \ -NS_IMETHOD GetClientLeft(int32_t* aClientLeft) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD GetClientLeft(int32_t* aClientLeft) final override \ { \ *aClientLeft = Element::ClientLeft(); \ return NS_OK; \ } \ -NS_IMETHOD GetClientWidth(int32_t* aClientWidth) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD GetClientWidth(int32_t* aClientWidth) final override \ { \ *aClientWidth = Element::ClientWidth(); \ return NS_OK; \ } \ -NS_IMETHOD GetClientHeight(int32_t* aClientHeight) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD GetClientHeight(int32_t* aClientHeight) final override \ { \ *aClientHeight = Element::ClientHeight(); \ return NS_OK; \ } \ -NS_IMETHOD GetScrollLeftMax(int32_t* aScrollLeftMax) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD GetScrollLeftMax(int32_t* aScrollLeftMax) final override \ { \ *aScrollLeftMax = Element::ScrollLeftMax(); \ return NS_OK; \ } \ -NS_IMETHOD GetScrollTopMax(int32_t* aScrollTopMax) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD GetScrollTopMax(int32_t* aScrollTopMax) final override \ { \ *aScrollTopMax = Element::ScrollTopMax(); \ return NS_OK; \ } \ NS_IMETHOD MozMatchesSelector(const nsAString& selector, \ - bool* _retval) MOZ_FINAL MOZ_OVERRIDE \ + bool* _retval) final override \ { \ mozilla::ErrorResult rv; \ *_retval = Element::MozMatchesSelector(selector, rv); \ return rv.ErrorCode(); \ } \ -NS_IMETHOD SetCapture(bool retargetToElement) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD SetCapture(bool retargetToElement) final override \ { \ Element::SetCapture(retargetToElement); \ return NS_OK; \ } \ -NS_IMETHOD ReleaseCapture(void) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD ReleaseCapture(void) final override \ { \ Element::ReleaseCapture(); \ return NS_OK; \ } \ -NS_IMETHOD MozRequestFullScreen(void) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD MozRequestFullScreen(void) final override \ { \ mozilla::ErrorResult rv; \ Element::MozRequestFullScreen(nullptr, JS::UndefinedHandleValue, rv); \ return rv.ErrorCode(); \ } \ -NS_IMETHOD MozRequestPointerLock(void) MOZ_FINAL MOZ_OVERRIDE \ +NS_IMETHOD MozRequestPointerLock(void) final override \ { \ Element::MozRequestPointerLock(); \ return NS_OK; \ } \ using nsINode::QuerySelector; \ NS_IMETHOD QuerySelector(const nsAString& aSelector, \ - nsIDOMElement **aReturn) MOZ_FINAL MOZ_OVERRIDE \ + nsIDOMElement **aReturn) final override \ { \ return nsINode::QuerySelector(aSelector, aReturn); \ } \ using nsINode::QuerySelectorAll; \ NS_IMETHOD QuerySelectorAll(const nsAString& aSelector, \ - nsIDOMNodeList **aReturn) MOZ_FINAL MOZ_OVERRIDE \ + nsIDOMNodeList **aReturn) final override \ { \ return nsINode::QuerySelectorAll(aSelector, aReturn); \ } diff --git a/dom/base/EventSource.cpp b/dom/base/EventSource.cpp index 48ccb933aae2..236f608077d7 100644 --- a/dom/base/EventSource.cpp +++ b/dom/base/EventSource.cpp @@ -488,7 +488,7 @@ EventSource::OnStopRequest(nsIRequest *aRequest, * Simple helper class that just forwards the redirect callback back * to the EventSource. */ -class AsyncVerifyRedirectCallbackFwr MOZ_FINAL : public nsIAsyncVerifyRedirectCallback +class AsyncVerifyRedirectCallbackFwr final : public nsIAsyncVerifyRedirectCallback { public: explicit AsyncVerifyRedirectCallbackFwr(EventSource* aEventsource) @@ -500,7 +500,7 @@ public: NS_DECL_CYCLE_COLLECTION_CLASS(AsyncVerifyRedirectCallbackFwr) // nsIAsyncVerifyRedirectCallback implementation - NS_IMETHOD OnRedirectVerifyCallback(nsresult aResult) MOZ_OVERRIDE + NS_IMETHOD OnRedirectVerifyCallback(nsresult aResult) override { nsresult rv = mEventSource->OnRedirectVerifyCallback(aResult); if (NS_FAILED(rv)) { diff --git a/dom/base/EventSource.h b/dom/base/EventSource.h index 92b3cc535290..7086b9f3f203 100644 --- a/dom/base/EventSource.h +++ b/dom/base/EventSource.h @@ -36,7 +36,7 @@ namespace dom { class AsyncVerifyRedirectCallbackFwr; struct EventSourceInit; -class EventSource MOZ_FINAL : public DOMEventTargetHelper +class EventSource final : public DOMEventTargetHelper , public nsIObserver , public nsIStreamListener , public nsIChannelEventSink @@ -58,7 +58,7 @@ public: NS_DECL_NSIINTERFACEREQUESTOR // nsWrapperCache - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; // WebIDL nsPIDOMWindow* @@ -98,7 +98,7 @@ public: // Determine if preferences allow EventSource static bool PrefEnabled(JSContext* aCx = nullptr, JSObject* aGlobal = nullptr); - virtual void DisconnectFromOwner() MOZ_OVERRIDE; + virtual void DisconnectFromOwner() override; protected: virtual ~EventSource(); diff --git a/dom/base/File.cpp b/dom/base/File.cpp index a38220f2fc96..6dfaf680a8e6 100644 --- a/dom/base/File.cpp +++ b/dom/base/File.cpp @@ -51,7 +51,7 @@ namespace dom { // ensure that the buffer underlying the stream we get // from NS_NewByteInputStream is held alive as long as the // stream is. We do that by passing back this class instead. -class DataOwnerAdapter MOZ_FINAL : public nsIInputStream, +class DataOwnerAdapter final : public nsIInputStream, public nsISeekableStream, public nsIIPCSerializableInputStream { @@ -1099,7 +1099,7 @@ FileImplMemory::DataOwner::sMemoryReporterRegistered = false; MOZ_DEFINE_MALLOC_SIZE_OF(MemoryFileDataOwnerMallocSizeOf) -class FileImplMemoryDataOwnerMemoryReporter MOZ_FINAL +class FileImplMemoryDataOwnerMemoryReporter final : public nsIMemoryReporter { ~FileImplMemoryDataOwnerMemoryReporter() {} @@ -1108,7 +1108,7 @@ public: NS_DECL_THREADSAFE_ISUPPORTS NS_IMETHOD CollectReports(nsIMemoryReporterCallback *aCallback, - nsISupports *aClosure, bool aAnonymize) MOZ_OVERRIDE + nsISupports *aClosure, bool aAnonymize) override { typedef FileImplMemory::DataOwner DataOwner; diff --git a/dom/base/File.h b/dom/base/File.h index cdd1466582d9..c8d4ac7ae23e 100644 --- a/dom/base/File.h +++ b/dom/base/File.h @@ -51,7 +51,7 @@ struct FilePropertyBag; class FileImpl; class OwningArrayBufferOrArrayBufferViewOrBlobOrString; -class File MOZ_FINAL : public nsIDOMFile +class File final : public nsIDOMFile , public nsIXHRSendable , public nsIMutable , public nsSupportsWeakReference @@ -189,7 +189,7 @@ public: const ChromeFilePropertyBag& aBag, ErrorResult& aRv); - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; uint64_t GetSize(ErrorResult& aRv); @@ -358,63 +358,63 @@ public: mContentType.SetIsVoid(false); } - virtual void GetName(nsAString& aName) MOZ_OVERRIDE; + virtual void GetName(nsAString& aName) override; - virtual nsresult GetPath(nsAString& aName) MOZ_OVERRIDE; + virtual nsresult GetPath(nsAString& aName) override; - virtual int64_t GetLastModified(ErrorResult& aRv) MOZ_OVERRIDE; + virtual int64_t GetLastModified(ErrorResult& aRv) override; - virtual void SetLastModified(int64_t aLastModified) MOZ_OVERRIDE; + virtual void SetLastModified(int64_t aLastModified) override; - virtual void GetMozFullPath(nsAString& aName, ErrorResult& aRv) MOZ_OVERRIDE; + virtual void GetMozFullPath(nsAString& aName, ErrorResult& aRv) override; virtual void GetMozFullPathInternal(nsAString& aFileName, - ErrorResult& aRv) MOZ_OVERRIDE; + ErrorResult& aRv) override; - virtual uint64_t GetSize(ErrorResult& aRv) MOZ_OVERRIDE + virtual uint64_t GetSize(ErrorResult& aRv) override { return mLength; } - virtual void GetType(nsAString& aType) MOZ_OVERRIDE; + virtual void GetType(nsAString& aType) override; virtual already_AddRefed CreateSlice(uint64_t aStart, uint64_t aLength, - const nsAString& aContentType, ErrorResult& aRv) MOZ_OVERRIDE + const nsAString& aContentType, ErrorResult& aRv) override { return nullptr; } virtual const nsTArray>* - GetSubBlobImpls() const MOZ_OVERRIDE + GetSubBlobImpls() const override { return nullptr; } - virtual nsresult GetInternalStream(nsIInputStream** aStream) MOZ_OVERRIDE + virtual nsresult GetInternalStream(nsIInputStream** aStream) override { return NS_ERROR_NOT_IMPLEMENTED; } - virtual int64_t GetFileId() MOZ_OVERRIDE; + virtual int64_t GetFileId() override; - virtual void AddFileInfo(indexedDB::FileInfo* aFileInfo) MOZ_OVERRIDE; + virtual void AddFileInfo(indexedDB::FileInfo* aFileInfo) override; virtual indexedDB::FileInfo* - GetFileInfo(indexedDB::FileManager* aFileManager) MOZ_OVERRIDE; + GetFileInfo(indexedDB::FileManager* aFileManager) override; virtual nsresult GetSendInfo(nsIInputStream** aBody, uint64_t* aContentLength, nsACString& aContentType, - nsACString& aCharset) MOZ_OVERRIDE; + nsACString& aCharset) override; - virtual nsresult GetMutable(bool* aMutable) const MOZ_OVERRIDE; + virtual nsresult GetMutable(bool* aMutable) const override; - virtual nsresult SetMutable(bool aMutable) MOZ_OVERRIDE; + virtual nsresult SetMutable(bool aMutable) override; virtual void SetLazyData(const nsAString& aName, const nsAString& aContentType, - uint64_t aLength, uint64_t aLastModifiedDate) MOZ_OVERRIDE + uint64_t aLength, uint64_t aLastModifiedDate) override { NS_ASSERTION(aLength, "must have length"); @@ -425,17 +425,17 @@ public: mIsFile = !aName.IsVoid(); } - virtual bool IsMemoryFile() const MOZ_OVERRIDE + virtual bool IsMemoryFile() const override { return false; } - virtual bool IsDateUnknown() const MOZ_OVERRIDE + virtual bool IsDateUnknown() const override { return mIsFile && mLastModificationDate == UINT64_MAX; } - virtual bool IsFile() const MOZ_OVERRIDE + virtual bool IsFile() const override { return mIsFile; } @@ -456,7 +456,7 @@ public: return false; } - virtual bool IsSizeUnknown() const MOZ_OVERRIDE + virtual bool IsSizeUnknown() const override { return mLength == UINT64_MAX; } @@ -492,7 +492,7 @@ protected: * This class may be used off the main thread, and in particular, its * constructor and destructor may not run on the same thread. Be careful! */ -class FileImplMemory MOZ_FINAL : public FileImplBase +class FileImplMemory final : public FileImplBase { public: NS_DECL_ISUPPORTS_INHERITED @@ -513,18 +513,18 @@ public: NS_ASSERTION(mDataOwner && mDataOwner->mData, "must have data"); } - virtual nsresult GetInternalStream(nsIInputStream** aStream) MOZ_OVERRIDE; + virtual nsresult GetInternalStream(nsIInputStream** aStream) override; virtual already_AddRefed CreateSlice(uint64_t aStart, uint64_t aLength, - const nsAString& aContentType, ErrorResult& aRv) MOZ_OVERRIDE; + const nsAString& aContentType, ErrorResult& aRv) override; - virtual bool IsMemoryFile() const MOZ_OVERRIDE + virtual bool IsMemoryFile() const override { return true; } - class DataOwner MOZ_FINAL : public mozilla::LinkedListElement { + class DataOwner final : public mozilla::LinkedListElement { public: NS_INLINE_DECL_THREADSAFE_REFCOUNTING(DataOwner) DataOwner(void* aMemoryBuffer, uint64_t aLength) @@ -585,7 +585,7 @@ private: nsRefPtr mDataOwner; }; -class FileImplTemporaryFileBlob MOZ_FINAL : public FileImplBase +class FileImplTemporaryFileBlob final : public FileImplBase { public: NS_DECL_ISUPPORTS_INHERITED @@ -600,11 +600,11 @@ public: mFileDescOwner = new nsTemporaryFileInputStream::FileDescOwner(aFD); } - virtual nsresult GetInternalStream(nsIInputStream** aStream) MOZ_OVERRIDE; + virtual nsresult GetInternalStream(nsIInputStream** aStream) override; virtual already_AddRefed CreateSlice(uint64_t aStart, uint64_t aLength, - const nsAString& aContentType, ErrorResult& aRv) MOZ_OVERRIDE; + const nsAString& aContentType, ErrorResult& aRv) override; private: FileImplTemporaryFileBlob(const FileImplTemporaryFileBlob* aOther, @@ -739,13 +739,13 @@ public: } // Overrides - virtual uint64_t GetSize(ErrorResult& aRv) MOZ_OVERRIDE; - virtual void GetType(nsAString& aType) MOZ_OVERRIDE; - virtual int64_t GetLastModified(ErrorResult& aRv) MOZ_OVERRIDE; - virtual void SetLastModified(int64_t aLastModified) MOZ_OVERRIDE; + virtual uint64_t GetSize(ErrorResult& aRv) override; + virtual void GetType(nsAString& aType) override; + virtual int64_t GetLastModified(ErrorResult& aRv) override; + virtual void SetLastModified(int64_t aLastModified) override; virtual void GetMozFullPathInternal(nsAString& aFullPath, - ErrorResult& aRv) MOZ_OVERRIDE; - virtual nsresult GetInternalStream(nsIInputStream**) MOZ_OVERRIDE; + ErrorResult& aRv) override; + virtual nsresult GetInternalStream(nsIInputStream**) override; void SetPath(const nsAString& aFullPath); @@ -795,14 +795,14 @@ private: virtual already_AddRefed CreateSlice(uint64_t aStart, uint64_t aLength, - const nsAString& aContentType, ErrorResult& aRv) MOZ_OVERRIDE; + const nsAString& aContentType, ErrorResult& aRv) override; - virtual bool IsStoredFile() const MOZ_OVERRIDE + virtual bool IsStoredFile() const override { return mStoredFile; } - virtual bool IsWholeFile() const MOZ_OVERRIDE + virtual bool IsWholeFile() const override { return mWholeFile; } @@ -813,7 +813,7 @@ private: bool mIsTemporary; }; -class FileList MOZ_FINAL : public nsIDOMFileList, +class FileList final : public nsIDOMFileList, public nsWrapperCache { ~FileList() {} @@ -828,7 +828,7 @@ public: NS_DECL_NSIDOMFILELIST - virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) override; nsISupports* GetParentObject() { diff --git a/dom/base/FragmentOrElement.h b/dom/base/FragmentOrElement.h index da9d43c9ce66..0e24f2e77660 100644 --- a/dom/base/FragmentOrElement.h +++ b/dom/base/FragmentOrElement.h @@ -44,7 +44,7 @@ class Element; * and Item to its existing child list. * @see nsIDOMNodeList */ -class nsChildContentList MOZ_FINAL : public nsINodeList +class nsChildContentList final : public nsINodeList { public: explicit nsChildContentList(nsINode* aNode) @@ -56,21 +56,21 @@ public: NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS(nsChildContentList) // nsWrapperCache - virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) override; // nsIDOMNodeList interface NS_DECL_NSIDOMNODELIST // nsINodeList interface - virtual int32_t IndexOf(nsIContent* aContent) MOZ_OVERRIDE; - virtual nsIContent* Item(uint32_t aIndex) MOZ_OVERRIDE; + virtual int32_t IndexOf(nsIContent* aContent) override; + virtual nsIContent* Item(uint32_t aIndex) override; void DropReference() { mNode = nullptr; } - virtual nsINode* GetParentObject() MOZ_OVERRIDE + virtual nsINode* GetParentObject() override { return mNode; } @@ -86,7 +86,7 @@ private: * A class that implements nsIWeakReference */ -class nsNodeWeakReference MOZ_FINAL : public nsIWeakReference +class nsNodeWeakReference final : public nsIWeakReference { public: explicit nsNodeWeakReference(nsINode* aNode) @@ -99,7 +99,7 @@ public: // nsIWeakReference NS_DECL_NSIWEAKREFERENCE - virtual size_t SizeOfOnlyThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE; + virtual size_t SizeOfOnlyThis(mozilla::MallocSizeOf aMallocSizeOf) const override; void NoticeNodeDestruction() { @@ -115,7 +115,7 @@ private: /** * Tearoff to use for nodes to implement nsISupportsWeakReference */ -class nsNodeSupportsWeakRefTearoff MOZ_FINAL : public nsISupportsWeakReference +class nsNodeSupportsWeakRefTearoff final : public nsISupportsWeakReference { public: explicit nsNodeSupportsWeakRefTearoff(nsINode* aNode) @@ -158,56 +158,56 @@ public: NS_DECL_SIZEOF_EXCLUDING_THIS // nsINode interface methods - virtual uint32_t GetChildCount() const MOZ_OVERRIDE; - virtual nsIContent *GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE; - virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const MOZ_OVERRIDE; - virtual int32_t IndexOf(const nsINode* aPossibleChild) const MOZ_OVERRIDE; + virtual uint32_t GetChildCount() const override; + virtual nsIContent *GetChildAt(uint32_t aIndex) const override; + virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const override; + virtual int32_t IndexOf(const nsINode* aPossibleChild) const override; virtual nsresult InsertChildAt(nsIContent* aKid, uint32_t aIndex, - bool aNotify) MOZ_OVERRIDE; - virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) MOZ_OVERRIDE; + bool aNotify) override; + virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) override; virtual void GetTextContentInternal(nsAString& aTextContent, - mozilla::ErrorResult& aError) MOZ_OVERRIDE; + mozilla::ErrorResult& aError) override; virtual void SetTextContentInternal(const nsAString& aTextContent, - mozilla::ErrorResult& aError) MOZ_OVERRIDE; + mozilla::ErrorResult& aError) override; // nsIContent interface methods - virtual already_AddRefed GetChildren(uint32_t aFilter) MOZ_OVERRIDE; - virtual const nsTextFragment *GetText() MOZ_OVERRIDE; - virtual uint32_t TextLength() const MOZ_OVERRIDE; + virtual already_AddRefed GetChildren(uint32_t aFilter) override; + virtual const nsTextFragment *GetText() override; + virtual uint32_t TextLength() const override; virtual nsresult SetText(const char16_t* aBuffer, uint32_t aLength, - bool aNotify) MOZ_OVERRIDE; + bool aNotify) override; // Need to implement this here too to avoid hiding. nsresult SetText(const nsAString& aStr, bool aNotify) { return SetText(aStr.BeginReading(), aStr.Length(), aNotify); } virtual nsresult AppendText(const char16_t* aBuffer, uint32_t aLength, - bool aNotify) MOZ_OVERRIDE; - virtual bool TextIsOnlyWhitespace() MOZ_OVERRIDE; - virtual bool HasTextForTranslation() MOZ_OVERRIDE; - virtual void AppendTextTo(nsAString& aResult) MOZ_OVERRIDE; + bool aNotify) override; + virtual bool TextIsOnlyWhitespace() override; + virtual bool HasTextForTranslation() override; + virtual void AppendTextTo(nsAString& aResult) override; virtual bool AppendTextTo(nsAString& aResult, - const mozilla::fallible_t&) MOZ_OVERRIDE NS_WARN_UNUSED_RESULT; - virtual nsIContent *GetBindingParent() const MOZ_OVERRIDE; - virtual nsXBLBinding *GetXBLBinding() const MOZ_OVERRIDE; + const mozilla::fallible_t&) override NS_WARN_UNUSED_RESULT; + virtual nsIContent *GetBindingParent() const override; + virtual nsXBLBinding *GetXBLBinding() const override; virtual void SetXBLBinding(nsXBLBinding* aBinding, - nsBindingManager* aOldBindingManager = nullptr) MOZ_OVERRIDE; - virtual ShadowRoot *GetShadowRoot() const MOZ_OVERRIDE; - virtual ShadowRoot *GetContainingShadow() const MOZ_OVERRIDE; - virtual nsTArray &DestInsertionPoints() MOZ_OVERRIDE; - virtual nsTArray *GetExistingDestInsertionPoints() const MOZ_OVERRIDE; - virtual void SetShadowRoot(ShadowRoot* aBinding) MOZ_OVERRIDE; - virtual nsIContent *GetXBLInsertionParent() const MOZ_OVERRIDE; - virtual void SetXBLInsertionParent(nsIContent* aContent) MOZ_OVERRIDE; - virtual bool IsLink(nsIURI** aURI) const MOZ_OVERRIDE; + nsBindingManager* aOldBindingManager = nullptr) override; + virtual ShadowRoot *GetShadowRoot() const override; + virtual ShadowRoot *GetContainingShadow() const override; + virtual nsTArray &DestInsertionPoints() override; + virtual nsTArray *GetExistingDestInsertionPoints() const override; + virtual void SetShadowRoot(ShadowRoot* aBinding) override; + virtual nsIContent *GetXBLInsertionParent() const override; + virtual void SetXBLInsertionParent(nsIContent* aContent) override; + virtual bool IsLink(nsIURI** aURI) const override; - virtual CustomElementData *GetCustomElementData() const MOZ_OVERRIDE; - virtual void SetCustomElementData(CustomElementData* aData) MOZ_OVERRIDE; + virtual CustomElementData *GetCustomElementData() const override; + virtual void SetCustomElementData(CustomElementData* aData) override; - virtual void DestroyContent() MOZ_OVERRIDE; - virtual void SaveSubtreeState() MOZ_OVERRIDE; + virtual void DestroyContent() override; + virtual void SaveSubtreeState() override; - NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker) MOZ_OVERRIDE; + NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker) override; nsIHTMLCollection* Children(); uint32_t ChildElementCount() @@ -239,7 +239,7 @@ public: */ void FireNodeRemovedForChildren(); - virtual bool OwnedOnlyByTheDOMTree() MOZ_OVERRIDE + virtual bool OwnedOnlyByTheDOMTree() override { uint32_t rc = mRefCnt.get(); if (GetParent()) { @@ -249,12 +249,12 @@ public: return rc == 0; } - virtual bool IsPurple() MOZ_OVERRIDE + virtual bool IsPurple() override { return mRefCnt.IsPurple(); } - virtual void RemovePurple() MOZ_OVERRIDE + virtual void RemovePurple() override { mRefCnt.RemovePurple(); } @@ -400,7 +400,7 @@ protected: void SetInnerHTMLInternal(const nsAString& aInnerHTML, ErrorResult& aError); // Override from nsINode - virtual nsINode::nsSlots* CreateSlots() MOZ_OVERRIDE; + virtual nsINode::nsSlots* CreateSlots() override; nsDOMSlots *DOMSlots() { diff --git a/dom/base/ImageEncoder.cpp b/dom/base/ImageEncoder.cpp index 62152ac98e60..2fd5ecc56858 100644 --- a/dom/base/ImageEncoder.cpp +++ b/dom/base/ImageEncoder.cpp @@ -82,7 +82,7 @@ public: , mFailed(false) {} - NS_IMETHOD Run() MOZ_OVERRIDE + NS_IMETHOD Run() override { nsresult rv = NS_OK; MOZ_ASSERT(NS_IsMainThread()); @@ -190,7 +190,7 @@ public: return rv; } - NS_IMETHOD Run() MOZ_OVERRIDE + NS_IMETHOD Run() override { uint64_t imgSize; void* imgData = nullptr; diff --git a/dom/base/ImportManager.h b/dom/base/ImportManager.h index 650d72c0142b..d63d7c84940c 100644 --- a/dom/base/ImportManager.h +++ b/dom/base/ImportManager.h @@ -61,7 +61,7 @@ class ImportManager; typedef nsTHashtable> NodeTable; -class ImportLoader MOZ_FINAL : public nsIStreamListener +class ImportLoader final : public nsIStreamListener , public nsIDOMEventListener { @@ -134,7 +134,7 @@ public: // We need to listen to DOMContentLoaded event to know when the document // is fully leaded. - NS_IMETHOD HandleEvent(nsIDOMEvent *aEvent) MOZ_OVERRIDE; + NS_IMETHOD HandleEvent(nsIDOMEvent *aEvent) override; // Validation then opening and starting up the channel. void Open(); @@ -238,7 +238,7 @@ private: Updater mUpdater; }; -class ImportManager MOZ_FINAL : public nsISupports +class ImportManager final : public nsISupports { typedef nsRefPtrHashtable ImportMap; diff --git a/dom/base/Link.h b/dom/base/Link.h index 0d98316f36f2..a676edf73d8c 100644 --- a/dom/base/Link.h +++ b/dom/base/Link.h @@ -115,7 +115,7 @@ public: bool ElementHasHref() const; // URLSearchParamsObserver - void URLSearchParamsUpdated(URLSearchParams* aSearchParams) MOZ_OVERRIDE; + void URLSearchParamsUpdated(URLSearchParams* aSearchParams) override; protected: virtual ~Link(); diff --git a/dom/base/MessageChannel.h b/dom/base/MessageChannel.h index e6e76239574c..87b28832a619 100644 --- a/dom/base/MessageChannel.h +++ b/dom/base/MessageChannel.h @@ -21,7 +21,7 @@ namespace dom { class MessagePort; -class MessageChannel MOZ_FINAL : public nsISupports +class MessageChannel final : public nsISupports , public nsWrapperCache { public: @@ -40,7 +40,7 @@ public: } virtual JSObject* - WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; static already_AddRefed Constructor(const GlobalObject& aGlobal, ErrorResult& aRv); diff --git a/dom/base/MessagePort.h b/dom/base/MessagePort.h index a003f86f194c..c713df05f1cf 100644 --- a/dom/base/MessagePort.h +++ b/dom/base/MessagePort.h @@ -51,7 +51,7 @@ public: Clone() = 0; }; -class MessagePort MOZ_FINAL : public MessagePortBase +class MessagePort final : public MessagePortBase { friend class DispatchEventRunnable; friend class PostMessageRunnable; @@ -64,24 +64,24 @@ public: explicit MessagePort(nsPIDOMWindow* aWindow); virtual JSObject* - WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; virtual void PostMessageMoz(JSContext* aCx, JS::Handle aMessage, const Optional>& aTransferable, - ErrorResult& aRv) MOZ_OVERRIDE; + ErrorResult& aRv) override; virtual void - Start() MOZ_OVERRIDE; + Start() override; virtual void - Close() MOZ_OVERRIDE; + Close() override; virtual EventHandlerNonNull* - GetOnmessage() MOZ_OVERRIDE; + GetOnmessage() override; virtual void - SetOnmessage(EventHandlerNonNull* aCallback) MOZ_OVERRIDE; + SetOnmessage(EventHandlerNonNull* aCallback) override; // Non WebIDL methods @@ -92,7 +92,7 @@ public: Entangle(MessagePort* aMessagePort); virtual already_AddRefed - Clone() MOZ_OVERRIDE; + Clone() override; private: ~MessagePort(); diff --git a/dom/base/MessagePortList.h b/dom/base/MessagePortList.h index c1e711179c8f..5b62bf72fac9 100644 --- a/dom/base/MessagePortList.h +++ b/dom/base/MessagePortList.h @@ -18,7 +18,7 @@ namespace mozilla { namespace dom { -class MessagePortList MOZ_FINAL : public nsISupports +class MessagePortList final : public nsISupports , public nsWrapperCache { ~MessagePortList() {} @@ -41,7 +41,7 @@ public: } virtual JSObject* - WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; uint32_t Length() const diff --git a/dom/base/MultipartFileImpl.h b/dom/base/MultipartFileImpl.h index 9ed65921b80f..657d3343c08c 100644 --- a/dom/base/MultipartFileImpl.h +++ b/dom/base/MultipartFileImpl.h @@ -17,7 +17,7 @@ using namespace mozilla; using namespace mozilla::dom; -class MultipartFileImpl MOZ_FINAL : public FileImplBase +class MultipartFileImpl final : public FileImplBase { public: NS_DECL_ISUPPORTS_INHERITED @@ -84,25 +84,25 @@ public: virtual already_AddRefed CreateSlice(uint64_t aStart, uint64_t aLength, const nsAString& aContentType, - ErrorResult& aRv) MOZ_OVERRIDE; + ErrorResult& aRv) override; - virtual uint64_t GetSize(ErrorResult& aRv) MOZ_OVERRIDE + virtual uint64_t GetSize(ErrorResult& aRv) override { return mLength; } - virtual nsresult GetInternalStream(nsIInputStream** aInputStream) MOZ_OVERRIDE; + virtual nsresult GetInternalStream(nsIInputStream** aInputStream) override; - virtual const nsTArray>* GetSubBlobImpls() const MOZ_OVERRIDE + virtual const nsTArray>* GetSubBlobImpls() const override { return &mBlobImpls; } virtual void GetMozFullPathInternal(nsAString& aFullPath, - ErrorResult& aRv) MOZ_OVERRIDE; + ErrorResult& aRv) override; virtual nsresult - SetMutable(bool aMutable) MOZ_OVERRIDE; + SetMutable(bool aMutable) override; void SetName(const nsAString& aName) { @@ -114,7 +114,7 @@ public: mIsFromNsIFile = aValue; } - virtual bool MayBeClonedToOtherThreads() const MOZ_OVERRIDE; + virtual bool MayBeClonedToOtherThreads() const override; protected: virtual ~MultipartFileImpl() {} diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index 70f78c63c6a5..30fce35e7118 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -950,7 +950,7 @@ Navigator::GetGeolocation(ErrorResult& aRv) return mGeolocation; } -class BeaconStreamListener MOZ_FINAL : public nsIStreamListener +class BeaconStreamListener final : public nsIStreamListener { ~BeaconStreamListener() {} @@ -2331,7 +2331,7 @@ Navigator::HasDataStoreSupport(nsIPrincipal* aPrincipal) // A WorkerMainThreadRunnable to synchronously dispatch the call of // HasDataStoreSupport() from the worker thread to the main thread. -class HasDataStoreSupportRunnable MOZ_FINAL +class HasDataStoreSupportRunnable final : public workers::WorkerMainThreadRunnable { public: @@ -2347,7 +2347,7 @@ public: protected: virtual bool - MainThreadRun() MOZ_OVERRIDE + MainThreadRun() override { workers::AssertIsOnMainThread(); diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h index 59805720d19b..fe99c242b58d 100644 --- a/dom/base/Navigator.h +++ b/dom/base/Navigator.h @@ -108,7 +108,7 @@ class AudioChannelManager; #endif } // namespace system -class Navigator MOZ_FINAL : public nsIDOMNavigator +class Navigator final : public nsIDOMNavigator , public nsIMozNavigatorNetwork , public nsWrapperCache { @@ -324,7 +324,7 @@ public: return GetWindow(); } - virtual JSObject* WrapObject(JSContext* cx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* cx, JS::Handle aGivenProto) override; // GetWindowFromGlobal returns the inner window for this global, if // any, else null. diff --git a/dom/base/NodeInfo.h b/dom/base/NodeInfo.h index dbc25829f474..b1291e7777e0 100644 --- a/dom/base/NodeInfo.h +++ b/dom/base/NodeInfo.h @@ -33,7 +33,7 @@ class nsNodeInfoManager; namespace mozilla { namespace dom { -class NodeInfo MOZ_FINAL +class NodeInfo final { public: NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(NodeInfo) diff --git a/dom/base/NodeIterator.h b/dom/base/NodeIterator.h index 38f0876ae736..54d89f2fc173 100644 --- a/dom/base/NodeIterator.h +++ b/dom/base/NodeIterator.h @@ -22,7 +22,7 @@ class nsIDOMNode; namespace mozilla { namespace dom { -class NodeIterator MOZ_FINAL : public nsIDOMNodeIterator, +class NodeIterator final : public nsIDOMNodeIterator, public nsTraversal, public nsStubMutationObserver { diff --git a/dom/base/PerformanceEntry.h b/dom/base/PerformanceEntry.h index 7015a6324fa9..9efb8bd623ab 100644 --- a/dom/base/PerformanceEntry.h +++ b/dom/base/PerformanceEntry.h @@ -27,7 +27,7 @@ public: NS_DECL_CYCLE_COLLECTING_ISUPPORTS NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(PerformanceEntry) - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; nsPerformance* GetParentObject() const { diff --git a/dom/base/PerformanceMark.h b/dom/base/PerformanceMark.h index 5bd73208fd87..0bd64bd6ce00 100644 --- a/dom/base/PerformanceMark.h +++ b/dom/base/PerformanceMark.h @@ -12,15 +12,15 @@ namespace mozilla { namespace dom { // http://www.w3.org/TR/user-timing/#performancemark -class PerformanceMark MOZ_FINAL : public PerformanceEntry +class PerformanceMark final : public PerformanceEntry { public: PerformanceMark(nsPerformance* aPerformance, const nsAString& aName); - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; - virtual DOMHighResTimeStamp StartTime() const MOZ_OVERRIDE + virtual DOMHighResTimeStamp StartTime() const override { return mStartTime; } diff --git a/dom/base/PerformanceMeasure.h b/dom/base/PerformanceMeasure.h index 60fa7e826d32..4c7ce8327758 100644 --- a/dom/base/PerformanceMeasure.h +++ b/dom/base/PerformanceMeasure.h @@ -12,7 +12,7 @@ namespace mozilla { namespace dom { // http://www.w3.org/TR/user-timing/#performancemeasure -class PerformanceMeasure MOZ_FINAL : public PerformanceEntry +class PerformanceMeasure final : public PerformanceEntry { public: PerformanceMeasure(nsPerformance* aPerformance, @@ -20,14 +20,14 @@ public: DOMHighResTimeStamp aStartTime, DOMHighResTimeStamp aEndTime); - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; - virtual DOMHighResTimeStamp StartTime() const MOZ_OVERRIDE + virtual DOMHighResTimeStamp StartTime() const override { return mStartTime; } - virtual DOMHighResTimeStamp Duration() const MOZ_OVERRIDE + virtual DOMHighResTimeStamp Duration() const override { return mDuration; } diff --git a/dom/base/PerformanceResourceTiming.h b/dom/base/PerformanceResourceTiming.h index 68762e5bafac..a1c99de07a6d 100644 --- a/dom/base/PerformanceResourceTiming.h +++ b/dom/base/PerformanceResourceTiming.h @@ -17,7 +17,7 @@ namespace mozilla { namespace dom { // http://www.w3.org/TR/resource-timing/#performanceresourcetiming -class PerformanceResourceTiming MOZ_FINAL : public PerformanceEntry +class PerformanceResourceTiming final : public PerformanceEntry { public: typedef mozilla::TimeStamp TimeStamp; @@ -31,12 +31,12 @@ public: nsPerformance* aPerformance, const nsAString& aName); - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; - virtual DOMHighResTimeStamp StartTime() const MOZ_OVERRIDE; + virtual DOMHighResTimeStamp StartTime() const override; - virtual DOMHighResTimeStamp Duration() const MOZ_OVERRIDE + virtual DOMHighResTimeStamp Duration() const override { return ResponseEnd() - StartTime(); } diff --git a/dom/base/ProcessGlobal.h b/dom/base/ProcessGlobal.h index 44ed110a0e81..5a2636b3b13c 100644 --- a/dom/base/ProcessGlobal.h +++ b/dom/base/ProcessGlobal.h @@ -48,7 +48,7 @@ public: virtual void LoadScript(const nsAString& aURL); - virtual JSObject* GetGlobalJSObject() MOZ_OVERRIDE + virtual JSObject* GetGlobalJSObject() override { if (!mGlobal) { return nullptr; @@ -56,9 +56,9 @@ public: return mGlobal->GetJSObject(); } - virtual nsIPrincipal* GetPrincipal() MOZ_OVERRIDE { return mPrincipal; } + virtual nsIPrincipal* GetPrincipal() override { return mPrincipal; } - virtual JSObject* WrapObject(JSContext* cx, JS::Handle aGivenProto) MOZ_OVERRIDE + virtual JSObject* WrapObject(JSContext* cx, JS::Handle aGivenProto) override { MOZ_CRASH("ProcessGlobal doesn't use DOM bindings!"); } diff --git a/dom/base/ShadowRoot.h b/dom/base/ShadowRoot.h index 2ef16d384dbb..ae7104fe3e35 100644 --- a/dom/base/ShadowRoot.h +++ b/dom/base/ShadowRoot.h @@ -103,7 +103,7 @@ public: nsIContent* GetPoolHost() { return mPoolHost; } nsTArray& ShadowDescendants() { return mShadowDescendants; } - JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; static bool IsPooledNode(nsIContent* aChild, nsIContent* aContainer, nsIContent* aHost); @@ -134,7 +134,7 @@ public: mIsComposedDocParticipant = aIsComposedDocParticipant; } - virtual void DestroyContent() MOZ_OVERRIDE; + virtual void DestroyContent() override; protected: virtual ~ShadowRoot(); @@ -195,13 +195,13 @@ public: NS_DECL_ISUPPORTS_INHERITED NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(ShadowRootStyleSheetList, StyleSheetList) - virtual nsINode* GetParentObject() const MOZ_OVERRIDE + virtual nsINode* GetParentObject() const override { return mShadowRoot; } - virtual uint32_t Length() MOZ_OVERRIDE; - virtual CSSStyleSheet* IndexedGetter(uint32_t aIndex, bool& aFound) MOZ_OVERRIDE; + virtual uint32_t Length() override; + virtual CSSStyleSheet* IndexedGetter(uint32_t aIndex, bool& aFound) override; protected: virtual ~ShadowRootStyleSheetList(); diff --git a/dom/base/StyleSheetList.h b/dom/base/StyleSheetList.h index 534b88b27255..f8884ba11ffe 100644 --- a/dom/base/StyleSheetList.h +++ b/dom/base/StyleSheetList.h @@ -24,7 +24,7 @@ public: NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(StyleSheetList) NS_DECL_NSIDOMSTYLESHEETLIST - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE MOZ_FINAL; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override final; virtual nsINode* GetParentObject() const = 0; diff --git a/dom/base/SubtleCrypto.h b/dom/base/SubtleCrypto.h index 0828c822a2ba..9712e740aefd 100644 --- a/dom/base/SubtleCrypto.h +++ b/dom/base/SubtleCrypto.h @@ -21,7 +21,7 @@ class Promise; typedef ArrayBufferViewOrArrayBuffer CryptoOperationData; -class SubtleCrypto MOZ_FINAL : public nsISupports, +class SubtleCrypto final : public nsISupports, public nsWrapperCache { ~SubtleCrypto() {} @@ -38,7 +38,7 @@ public: return mParent; } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; already_AddRefed Encrypt(JSContext* cx, const ObjectOrString& algorithm, diff --git a/dom/base/TextInputProcessor.cpp b/dom/base/TextInputProcessor.cpp index f9d869765c7b..430cd472c09a 100644 --- a/dom/base/TextInputProcessor.cpp +++ b/dom/base/TextInputProcessor.cpp @@ -20,7 +20,7 @@ namespace mozilla { * TextInputProcessorNotification ******************************************************************************/ -class TextInputProcessorNotification MOZ_FINAL : +class TextInputProcessorNotification final : public nsITextInputProcessorNotification { public: @@ -31,7 +31,7 @@ public: NS_DECL_ISUPPORTS - NS_IMETHOD GetType(nsACString& aType) MOZ_OVERRIDE MOZ_FINAL + NS_IMETHOD GetType(nsACString& aType) override final { aType = mType; return NS_OK; diff --git a/dom/base/TextInputProcessor.h b/dom/base/TextInputProcessor.h index e9ef260fffc5..401605320881 100644 --- a/dom/base/TextInputProcessor.h +++ b/dom/base/TextInputProcessor.h @@ -20,7 +20,7 @@ namespace widget{ class TextEventDispatcher; } // namespace widget -class TextInputProcessor MOZ_FINAL : public nsITextInputProcessor +class TextInputProcessor final : public nsITextInputProcessor , public widget::TextEventDispatcherListener { typedef mozilla::widget::IMENotification IMENotification; @@ -34,9 +34,9 @@ public: // TextEventDispatcherListener NS_IMETHOD NotifyIME(TextEventDispatcher* aTextEventDispatcher, - const IMENotification& aNotification) MOZ_OVERRIDE; + const IMENotification& aNotification) override; NS_IMETHOD_(void) - OnRemovedFrom(TextEventDispatcher* aTextEventDispatcher) MOZ_OVERRIDE; + OnRemovedFrom(TextEventDispatcher* aTextEventDispatcher) override; protected: virtual ~TextInputProcessor(); diff --git a/dom/base/ThirdPartyUtil.h b/dom/base/ThirdPartyUtil.h index a541b3096985..f0018693d484 100644 --- a/dom/base/ThirdPartyUtil.h +++ b/dom/base/ThirdPartyUtil.h @@ -15,7 +15,7 @@ class nsIURI; class nsIChannel; class nsIDOMWindow; -class ThirdPartyUtil MOZ_FINAL : public mozIThirdPartyUtil +class ThirdPartyUtil final : public mozIThirdPartyUtil { public: NS_DECL_ISUPPORTS diff --git a/dom/base/TreeWalker.h b/dom/base/TreeWalker.h index 688ba23ed9a2..bbac7fd67f3a 100644 --- a/dom/base/TreeWalker.h +++ b/dom/base/TreeWalker.h @@ -23,7 +23,7 @@ class nsIDOMNode; namespace mozilla { namespace dom { -class TreeWalker MOZ_FINAL : public nsIDOMTreeWalker, public nsTraversal +class TreeWalker final : public nsIDOMTreeWalker, public nsTraversal { virtual ~TreeWalker(); diff --git a/dom/base/URL.h b/dom/base/URL.h index 69c19bb3ec51..3b17727bf225 100644 --- a/dom/base/URL.h +++ b/dom/base/URL.h @@ -32,7 +32,7 @@ namespace workers { class URLProxy; } -class URL MOZ_FINAL : public URLSearchParamsObserver +class URL final : public URLSearchParamsObserver { ~URL() {} @@ -123,7 +123,7 @@ public: } // URLSearchParamsObserver - void URLSearchParamsUpdated(URLSearchParams* aSearchParams) MOZ_OVERRIDE; + void URLSearchParamsUpdated(URLSearchParams* aSearchParams) override; private: nsIURI* GetURI() const diff --git a/dom/base/URLSearchParams.h b/dom/base/URLSearchParams.h index af39ca02900c..86ac459008d2 100644 --- a/dom/base/URLSearchParams.h +++ b/dom/base/URLSearchParams.h @@ -26,7 +26,7 @@ public: virtual void URLSearchParamsUpdated(URLSearchParams* aFromThis) = 0; }; -class URLSearchParams MOZ_FINAL : public nsISupports, +class URLSearchParams final : public nsISupports, public nsWrapperCache { ~URLSearchParams(); @@ -44,7 +44,7 @@ public: } virtual JSObject* - WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; static already_AddRefed Constructor(const GlobalObject& aGlobal, const nsAString& aInit, diff --git a/dom/base/WebSocket.cpp b/dom/base/WebSocket.cpp index dc1e33617d7d..928b28ded8f3 100644 --- a/dom/base/WebSocket.cpp +++ b/dom/base/WebSocket.cpp @@ -61,7 +61,7 @@ using namespace mozilla::dom::workers; namespace mozilla { namespace dom { -class WebSocketImpl MOZ_FINAL : public nsIInterfaceRequestor +class WebSocketImpl final : public nsIInterfaceRequestor , public nsIWebSocketListener , public nsIObserver , public nsSupportsWeakReference @@ -246,7 +246,7 @@ NS_IMPL_ISUPPORTS(WebSocketImpl, nsIRequest, nsIEventTarget) -class CallDispatchConnectionCloseEvents MOZ_FINAL : public nsCancelableRunnable +class CallDispatchConnectionCloseEvents final : public nsCancelableRunnable { public: explicit CallDispatchConnectionCloseEvents(WebSocketImpl* aWebSocketImpl) @@ -272,7 +272,7 @@ private: namespace { -class PrintErrorOnConsoleRunnable MOZ_FINAL : public WorkerMainThreadRunnable +class PrintErrorOnConsoleRunnable final : public WorkerMainThreadRunnable { public: PrintErrorOnConsoleRunnable(WebSocketImpl* aImpl, @@ -289,7 +289,7 @@ public: , mRv(NS_ERROR_FAILURE) { } - bool MainThreadRun() MOZ_OVERRIDE + bool MainThreadRun() override { mRv = mImpl->PrintErrorOnConsole(mBundleURI, mError, mFormatStrings, mFormatStringsLen); @@ -384,7 +384,7 @@ WebSocketImpl::PrintErrorOnConsole(const char *aBundleURI, namespace { -class CloseRunnable MOZ_FINAL : public WorkerMainThreadRunnable +class CloseRunnable final : public WorkerMainThreadRunnable { public: CloseRunnable(WebSocketImpl* aImpl, uint16_t aReasonCode, @@ -396,7 +396,7 @@ public: , mRv(NS_ERROR_FAILURE) { } - bool MainThreadRun() MOZ_OVERRIDE + bool MainThreadRun() override { mRv = mImpl->mChannel->Close(mReasonCode, mReasonString); return true; @@ -542,7 +542,7 @@ WebSocketImpl::FailConnection(uint16_t aReasonCode, namespace { -class DisconnectInternalRunnable MOZ_FINAL : public WorkerMainThreadRunnable +class DisconnectInternalRunnable final : public WorkerMainThreadRunnable { public: explicit DisconnectInternalRunnable(WebSocketImpl* aImpl) @@ -550,7 +550,7 @@ public: , mImpl(aImpl) { } - bool MainThreadRun() MOZ_OVERRIDE + bool MainThreadRun() override { mImpl->DisconnectInternal(); return true; @@ -959,7 +959,7 @@ private: JSContext* mCx; }; -class InitRunnable MOZ_FINAL : public WorkerMainThreadRunnable +class InitRunnable final : public WorkerMainThreadRunnable { public: InitRunnable(WebSocketImpl* aImpl, const nsAString& aURL, @@ -979,7 +979,7 @@ public: mWorkerPrivate->AssertIsOnWorkerThread(); } - bool MainThreadRun() MOZ_OVERRIDE + bool MainThreadRun() override { AssertIsOnMainThread(); @@ -1052,7 +1052,7 @@ private: bool* mConnectionFailed; }; -class AsyncOpenRunnable MOZ_FINAL : public WorkerMainThreadRunnable +class AsyncOpenRunnable final : public WorkerMainThreadRunnable { public: AsyncOpenRunnable(WebSocketImpl* aImpl, ErrorResult& aRv) @@ -1064,7 +1064,7 @@ public: mWorkerPrivate->AssertIsOnWorkerThread(); } - bool MainThreadRun() MOZ_OVERRIDE + bool MainThreadRun() override { AssertIsOnMainThread(); mImpl->AsyncOpen(mRv); @@ -1517,7 +1517,7 @@ WebSocketImpl::AsyncOpen(ErrorResult& aRv) // WebSocketImpl methods: //----------------------------------------------------------------------------- -class nsAutoCloseWS MOZ_FINAL +class nsAutoCloseWS final { public: explicit nsAutoCloseWS(WebSocketImpl* aWebSocketImpl) @@ -1768,7 +1768,7 @@ WebSocket::CreateAndDispatchCloseEvent(bool aWasClean, namespace { -class PrefEnabledRunnable MOZ_FINAL : public WorkerMainThreadRunnable +class PrefEnabledRunnable final : public WorkerMainThreadRunnable { public: explicit PrefEnabledRunnable(WorkerPrivate* aWorkerPrivate) @@ -1776,7 +1776,7 @@ public: , mEnabled(false) { } - bool MainThreadRun() MOZ_OVERRIDE + bool MainThreadRun() override { AssertIsOnMainThread(); mEnabled = Preferences::GetBool("dom.workers.websocket.enabled", false); @@ -1976,7 +1976,7 @@ WebSocket::DontKeepAliveAnyMore() namespace { -class WebSocketWorkerFeature MOZ_FINAL : public WorkerFeature +class WebSocketWorkerFeature final : public WorkerFeature { public: explicit WebSocketWorkerFeature(WebSocketImpl* aWebSocketImpl) @@ -1984,7 +1984,7 @@ public: { } - bool Notify(JSContext* aCx, Status aStatus) MOZ_OVERRIDE + bool Notify(JSContext* aCx, Status aStatus) override { MOZ_ASSERT(aStatus > workers::Running); @@ -2000,7 +2000,7 @@ public: return true; } - bool Suspend(JSContext* aCx) MOZ_OVERRIDE + bool Suspend(JSContext* aCx) override { { MutexAutoLock lock(mWebSocketImpl->mMutex); @@ -2402,7 +2402,7 @@ WebSocketImpl::GetStatus(nsresult* aStatus) namespace { -class CancelRunnable MOZ_FINAL : public WorkerRunnable +class CancelRunnable final : public WorkerRunnable { public: CancelRunnable(WorkerPrivate* aWorkerPrivate, WebSocketImpl* aImpl) @@ -2564,7 +2564,7 @@ WebSocketImpl::SetLoadFlags(nsLoadFlags aLoadFlags) namespace { -class WorkerRunnableDispatcher MOZ_FINAL : public WorkerRunnable +class WorkerRunnableDispatcher final : public WorkerRunnable { nsRefPtr mWebSocketImpl; diff --git a/dom/base/WebSocket.h b/dom/base/WebSocket.h index fc9ccefa2201..714f77380009 100644 --- a/dom/base/WebSocket.h +++ b/dom/base/WebSocket.h @@ -36,7 +36,7 @@ class File; class WebSocketImpl; -class WebSocket MOZ_FINAL : public DOMEventTargetHelper +class WebSocket final : public DOMEventTargetHelper { friend class WebSocketImpl; @@ -54,15 +54,15 @@ public: WebSocket, DOMEventTargetHelper) // EventTarget - virtual void EventListenerAdded(nsIAtom* aType) MOZ_OVERRIDE; - virtual void EventListenerRemoved(nsIAtom* aType) MOZ_OVERRIDE; + virtual void EventListenerAdded(nsIAtom* aType) override; + virtual void EventListenerRemoved(nsIAtom* aType) override; - virtual void DisconnectFromOwner() MOZ_OVERRIDE; + virtual void DisconnectFromOwner() override; // nsWrapperCache nsPIDOMWindow* GetParentObject() { return GetOwner(); } - virtual JSObject* WrapObject(JSContext* cx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* cx, JS::Handle aGivenProto) override; public: // static helpers: diff --git a/dom/base/WindowNamedPropertiesHandler.h b/dom/base/WindowNamedPropertiesHandler.h index da7e1c69bec7..67ae7e585441 100644 --- a/dom/base/WindowNamedPropertiesHandler.h +++ b/dom/base/WindowNamedPropertiesHandler.h @@ -24,33 +24,33 @@ public: JS::Handle aId, bool /* unused */, JS::MutableHandle aDesc) - const MOZ_OVERRIDE; + const override; virtual bool defineProperty(JSContext* aCx, JS::Handle aProxy, JS::Handle aId, JS::MutableHandle aDesc, - JS::ObjectOpResult &result) const MOZ_OVERRIDE; + JS::ObjectOpResult &result) const override; virtual bool ownPropNames(JSContext* aCx, JS::Handle aProxy, unsigned flags, - JS::AutoIdVector& aProps) const MOZ_OVERRIDE; + JS::AutoIdVector& aProps) const override; virtual bool delete_(JSContext* aCx, JS::Handle aProxy, JS::Handle aId, - JS::ObjectOpResult &aResult) const MOZ_OVERRIDE; + JS::ObjectOpResult &aResult) const override; virtual bool preventExtensions(JSContext* aCx, JS::Handle aProxy, - JS::ObjectOpResult& aResult) const MOZ_OVERRIDE + JS::ObjectOpResult& aResult) const override { return aResult.failCantPreventExtensions(); } virtual bool isExtensible(JSContext* aCx, JS::Handle aProxy, - bool* aIsExtensible) const MOZ_OVERRIDE + bool* aIsExtensible) const override { *aIsExtensible = true; return true; } virtual const char* - className(JSContext *aCx, JS::Handle aProxy) const MOZ_OVERRIDE + className(JSContext *aCx, JS::Handle aProxy) const override { return "WindowProperties"; } diff --git a/dom/base/nsAttrValueInlines.h b/dom/base/nsAttrValueInlines.h index dd34541bad3b..eeb2f3e81e10 100644 --- a/dom/base/nsAttrValueInlines.h +++ b/dom/base/nsAttrValueInlines.h @@ -13,7 +13,7 @@ struct MiscContainer; -struct MiscContainer MOZ_FINAL +struct MiscContainer final { typedef nsAttrValue::ValueType ValueType; diff --git a/dom/base/nsCCUncollectableMarker.h b/dom/base/nsCCUncollectableMarker.h index 9c741af2f563..da8074de534d 100644 --- a/dom/base/nsCCUncollectableMarker.h +++ b/dom/base/nsCCUncollectableMarker.h @@ -10,7 +10,7 @@ #include "mozilla/Attributes.h" #include "nsIObserver.h" -class nsCCUncollectableMarker MOZ_FINAL : public nsIObserver +class nsCCUncollectableMarker final : public nsIObserver { NS_DECL_ISUPPORTS NS_DECL_NSIOBSERVER diff --git a/dom/base/nsContentIterator.cpp b/dom/base/nsContentIterator.cpp index ebcc936ee4d8..5550b38c2624 100644 --- a/dom/base/nsContentIterator.cpp +++ b/dom/base/nsContentIterator.cpp @@ -86,23 +86,23 @@ public: // nsIContentIterator interface methods ------------------------------ - virtual nsresult Init(nsINode* aRoot) MOZ_OVERRIDE; + virtual nsresult Init(nsINode* aRoot) override; - virtual nsresult Init(nsIDOMRange* aRange) MOZ_OVERRIDE; + virtual nsresult Init(nsIDOMRange* aRange) override; - virtual void First() MOZ_OVERRIDE; + virtual void First() override; - virtual void Last() MOZ_OVERRIDE; + virtual void Last() override; - virtual void Next() MOZ_OVERRIDE; + virtual void Next() override; - virtual void Prev() MOZ_OVERRIDE; + virtual void Prev() override; - virtual nsINode* GetCurrentNode() MOZ_OVERRIDE; + virtual nsINode* GetCurrentNode() override; - virtual bool IsDone() MOZ_OVERRIDE; + virtual bool IsDone() override; - virtual nsresult PositionAt(nsINode* aCurNode) MOZ_OVERRIDE; + virtual nsresult PositionAt(nsINode* aCurNode) override; protected: virtual ~nsContentIterator(); @@ -1113,21 +1113,21 @@ public: // nsContentIterator overrides ------------------------------ - virtual nsresult Init(nsINode* aRoot) MOZ_OVERRIDE; + virtual nsresult Init(nsINode* aRoot) override; - virtual nsresult Init(nsIDOMRange* aRange) MOZ_OVERRIDE; + virtual nsresult Init(nsIDOMRange* aRange) override; - virtual void Next() MOZ_OVERRIDE; + virtual void Next() override; - virtual void Prev() MOZ_OVERRIDE; + virtual void Prev() override; - virtual nsresult PositionAt(nsINode* aCurNode) MOZ_OVERRIDE; + virtual nsresult PositionAt(nsINode* aCurNode) override; // Must override these because we don't do PositionAt - virtual void First() MOZ_OVERRIDE; + virtual void First() override; // Must override these because we don't do PositionAt - virtual void Last() MOZ_OVERRIDE; + virtual void Last() override; protected: virtual ~nsContentSubtreeIterator() {} @@ -1143,7 +1143,7 @@ protected: nsContentSubtreeIterator(const nsContentSubtreeIterator&); nsContentSubtreeIterator& operator=(const nsContentSubtreeIterator&); - virtual void LastRelease() MOZ_OVERRIDE; + virtual void LastRelease() override; nsRefPtr mRange; diff --git a/dom/base/nsContentList.h b/dom/base/nsContentList.h index d95c508f77da..7fb59bac0e2e 100644 --- a/dom/base/nsContentList.h +++ b/dom/base/nsContentList.h @@ -45,8 +45,8 @@ public: NS_DECL_NSIDOMNODELIST // nsINodeList - virtual int32_t IndexOf(nsIContent* aContent) MOZ_OVERRIDE; - virtual nsIContent* Item(uint32_t aIndex) MOZ_OVERRIDE; + virtual int32_t IndexOf(nsIContent* aContent) override; + virtual nsIContent* Item(uint32_t aIndex) override; uint32_t Length() const { return mElements.Length(); @@ -88,7 +88,7 @@ public: virtual int32_t IndexOf(nsIContent *aContent, bool aDoFlush); virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) - MOZ_OVERRIDE = 0; + override = 0; void SetCapacity(uint32_t aCapacity) { @@ -121,11 +121,11 @@ public: NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsSimpleContentList, nsBaseContentList) - virtual nsINode* GetParentObject() MOZ_OVERRIDE + virtual nsINode* GetParentObject() override { return mRoot; } - virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) override; protected: virtual ~nsSimpleContentList() {} @@ -251,11 +251,11 @@ public: // nsWrapperCache using nsWrapperCache::GetWrapperPreserveColor; - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; protected: virtual ~nsContentList(); - virtual JSObject* GetWrapperPreserveColorInternal() MOZ_OVERRIDE + virtual JSObject* GetWrapperPreserveColorInternal() override { return nsWrapperCache::GetWrapperPreserveColor(); } @@ -265,24 +265,24 @@ public: NS_DECL_NSIDOMHTMLCOLLECTION // nsBaseContentList overrides - virtual int32_t IndexOf(nsIContent *aContent, bool aDoFlush) MOZ_OVERRIDE; - virtual int32_t IndexOf(nsIContent* aContent) MOZ_OVERRIDE; - virtual nsINode* GetParentObject() MOZ_OVERRIDE + virtual int32_t IndexOf(nsIContent *aContent, bool aDoFlush) override; + virtual int32_t IndexOf(nsIContent* aContent) override; + virtual nsINode* GetParentObject() override { return mRootNode; } - virtual nsIContent* Item(uint32_t aIndex) MOZ_OVERRIDE; - virtual mozilla::dom::Element* GetElementAt(uint32_t index) MOZ_OVERRIDE; + virtual nsIContent* Item(uint32_t aIndex) override; + virtual mozilla::dom::Element* GetElementAt(uint32_t index) override; virtual mozilla::dom::Element* - GetFirstNamedElement(const nsAString& aName, bool& aFound) MOZ_OVERRIDE + GetFirstNamedElement(const nsAString& aName, bool& aFound) override { mozilla::dom::Element* item = NamedItem(aName, true); aFound = !!item; return item; } virtual void GetSupportedNames(unsigned aFlags, - nsTArray& aNames) MOZ_OVERRIDE; + nsTArray& aNames) override; // nsContentList public methods uint32_t Length(bool aDoFlush); @@ -392,7 +392,7 @@ protected: * Needed because if subclasses want to have cache behavior they can't just * override RemoveFromHashtable(), since we call that in our destructor. */ - virtual void RemoveFromCaches() MOZ_OVERRIDE + virtual void RemoveFromCaches() override { RemoveFromHashtable(); } @@ -511,7 +511,7 @@ protected: MOZ_ASSERT(mData); } - virtual void RemoveFromCaches() MOZ_OVERRIDE { + virtual void RemoveFromCaches() override { RemoveFromFuncStringHashtable(); } void RemoveFromFuncStringHashtable(); @@ -536,7 +536,7 @@ public: #endif } - virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) override; #ifdef DEBUG static const ContentListType sType; @@ -560,7 +560,7 @@ public: #endif } - virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) override; #ifdef DEBUG static const ContentListType sType; diff --git a/dom/base/nsContentPermissionHelper.h b/dom/base/nsContentPermissionHelper.h index e410105e68e1..f51d706c6106 100644 --- a/dom/base/nsContentPermissionHelper.h +++ b/dom/base/nsContentPermissionHelper.h @@ -106,7 +106,7 @@ class nsContentPermissionRequestProxy : public nsIContentPermissionRequest /** * RemotePermissionRequest will send a prompt ipdl request to b2g process. */ -class RemotePermissionRequest MOZ_FINAL : public nsISupports +class RemotePermissionRequest final : public nsISupports , public mozilla::dom::PContentPermissionRequestChild { public: @@ -117,7 +117,7 @@ public: // It will be called when prompt dismissed. virtual bool Recv__delete__(const bool &aAllow, - InfallibleTArray&& aChoices) MOZ_OVERRIDE; + InfallibleTArray&& aChoices) override; void IPDLAddRef() { diff --git a/dom/base/nsContentSink.h b/dom/base/nsContentSink.h index 198018e91571..4339b6eeb906 100644 --- a/dom/base/nsContentSink.h +++ b/dom/base/nsContentSink.h @@ -88,7 +88,7 @@ class nsContentSink : public nsICSSLoaderObserver, // nsICSSLoaderObserver NS_IMETHOD StyleSheetLoaded(mozilla::CSSStyleSheet* aSheet, bool aWasAlternate, - nsresult aStatus) MOZ_OVERRIDE; + nsresult aStatus) override; virtual nsresult ProcessMETATag(nsIContent* aContent); diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index e3469253b6c1..5754db9a443e 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -333,7 +333,7 @@ static NS_DEFINE_CID(kCParserCID, NS_PARSER_CID); static PLDHashTable sEventListenerManagersHash; -class DOMEventListenerManagersHashReporter MOZ_FINAL : public nsIMemoryReporter +class DOMEventListenerManagersHashReporter final : public nsIMemoryReporter { MOZ_DEFINE_MALLOC_SIZE_OF(MallocSizeOf) @@ -343,7 +343,7 @@ public: NS_DECL_ISUPPORTS NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport, - nsISupports* aData, bool aAnonymize) MOZ_OVERRIDE + nsISupports* aData, bool aAnonymize) override { // We don't measure the |EventListenerManager| objects pointed to by the // entries because those references are non-owning. @@ -398,7 +398,7 @@ EventListenerManagerHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) lm->~EventListenerManagerMapEntry(); } -class SameOriginCheckerImpl MOZ_FINAL : public nsIChannelEventSink, +class SameOriginCheckerImpl final : public nsIChannelEventSink, public nsIInterfaceRequestor { ~SameOriginCheckerImpl() {} @@ -408,12 +408,12 @@ class SameOriginCheckerImpl MOZ_FINAL : public nsIChannelEventSink, NS_DECL_NSIINTERFACEREQUESTOR }; -class CharsetDetectionObserver MOZ_FINAL : public nsICharsetDetectionObserver +class CharsetDetectionObserver final : public nsICharsetDetectionObserver { public: NS_DECL_ISUPPORTS - NS_IMETHOD Notify(const char *aCharset, nsDetectionConfident aConf) MOZ_OVERRIDE + NS_IMETHOD Notify(const char *aCharset, nsDetectionConfident aConf) override { mCharset = aCharset; return NS_OK; diff --git a/dom/base/nsDOMAttributeMap.h b/dom/base/nsDOMAttributeMap.h index 81bda8d45c10..590af229aa0b 100644 --- a/dom/base/nsDOMAttributeMap.h +++ b/dom/base/nsDOMAttributeMap.h @@ -140,7 +140,7 @@ public: { return mContent; } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; // WebIDL Attr* GetNamedItem(const nsAString& aAttrName); diff --git a/dom/base/nsDOMCaretPosition.h b/dom/base/nsDOMCaretPosition.h index 12b483360f0a..1e31c1966d26 100644 --- a/dom/base/nsDOMCaretPosition.h +++ b/dom/base/nsDOMCaretPosition.h @@ -86,7 +86,7 @@ public: } virtual JSObject* WrapObject(JSContext *aCx, JS::Handle aGivenProto) - MOZ_OVERRIDE MOZ_FINAL; + override final; protected: virtual ~nsDOMCaretPosition(); diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index e3e535697f2b..e1c2cfc73827 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -1325,7 +1325,7 @@ DefineInterfaceConstants(JSContext *cx, JS::Handle obj, const nsIID * return NS_OK; } -class nsDOMConstructor MOZ_FINAL : public nsIDOMDOMConstructor +class nsDOMConstructor final : public nsIDOMDOMConstructor { protected: nsDOMConstructor(const char16_t* aName, diff --git a/dom/base/nsDOMClassInfo.h b/dom/base/nsDOMClassInfo.h index 11fd7ce001e2..8c6e6fd2005e 100644 --- a/dom/base/nsDOMClassInfo.h +++ b/dom/base/nsDOMClassInfo.h @@ -132,7 +132,7 @@ protected: const nsDOMClassInfoData* mData; - virtual void PreserveWrapper(nsISupports *aNative) MOZ_OVERRIDE + virtual void PreserveWrapper(nsISupports *aNative) override { } @@ -206,11 +206,11 @@ protected: } public: NS_IMETHOD PreCreate(nsISupports *nativeObj, JSContext *cx, - JSObject *globalObj, JSObject **parentObj) MOZ_OVERRIDE; + JSObject *globalObj, JSObject **parentObj) override; NS_IMETHOD AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, - JSObject *obj, jsid id, JS::Value *vp, bool *_retval) MOZ_OVERRIDE; + JSObject *obj, jsid id, JS::Value *vp, bool *_retval) override; - virtual void PreserveWrapper(nsISupports *aNative) MOZ_OVERRIDE; + virtual void PreserveWrapper(nsISupports *aNative) override; static nsIClassInfo *doCreate(nsDOMClassInfoData* aData) { @@ -269,23 +269,23 @@ protected: public: NS_IMETHOD PreCreate(nsISupports *nativeObj, JSContext *cx, - JSObject *globalObj, JSObject **parentObj) MOZ_OVERRIDE; - NS_IMETHOD PostCreatePrototype(JSContext * cx, JSObject * proto) MOZ_OVERRIDE + JSObject *globalObj, JSObject **parentObj) override; + NS_IMETHOD PostCreatePrototype(JSContext * cx, JSObject * proto) override { return NS_OK; } NS_IMETHOD Resolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx, JSObject *obj, jsid id, bool *resolvedp, - bool *_retval) MOZ_OVERRIDE; + bool *_retval) override; NS_IMETHOD Call(nsIXPConnectWrappedNative *wrapper, JSContext *cx, - JSObject *obj, const JS::CallArgs &args, bool *_retval) MOZ_OVERRIDE; + JSObject *obj, const JS::CallArgs &args, bool *_retval) override; NS_IMETHOD Construct(nsIXPConnectWrappedNative *wrapper, JSContext *cx, - JSObject *obj, const JS::CallArgs &args, bool *_retval) MOZ_OVERRIDE; + JSObject *obj, const JS::CallArgs &args, bool *_retval) override; NS_IMETHOD HasInstance(nsIXPConnectWrappedNative *wrapper, JSContext *cx, JSObject *obj, JS::Handle val, bool *bp, - bool *_retval) MOZ_OVERRIDE; + bool *_retval) override; static nsIClassInfo *doCreate(nsDOMClassInfoData* aData) { @@ -305,7 +305,7 @@ protected: } public: - NS_IMETHOD GetFlags(uint32_t *aFlags) MOZ_OVERRIDE; + NS_IMETHOD GetFlags(uint32_t *aFlags) override; static nsIClassInfo *doCreate(nsDOMClassInfoData* aData) { @@ -328,9 +328,9 @@ protected: public: NS_IMETHOD Resolve(nsIXPConnectWrappedNative* wrapper, JSContext* cx, JSObject* obj_, jsid id_, bool* resolvedp, - bool* _retval) MOZ_OVERRIDE; + bool* _retval) override; NS_IMETHOD Enumerate(nsIXPConnectWrappedNative* wrapper, JSContext* cx, - JSObject* obj_, bool* _retval) MOZ_OVERRIDE; + JSObject* obj_, bool* _retval) override; static nsIClassInfo *doCreate(nsDOMClassInfoData* aData) { diff --git a/dom/base/nsDOMDataChannel.h b/dom/base/nsDOMDataChannel.h index 738fce8290ac..8e4add68c235 100644 --- a/dom/base/nsDOMDataChannel.h +++ b/dom/base/nsDOMDataChannel.h @@ -43,7 +43,7 @@ public: mozilla::DOMEventTargetHelper) virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) - MOZ_OVERRIDE; + override; nsPIDOMWindow* GetParentObject() const { return GetOwner(); @@ -84,18 +84,18 @@ public: DoOnMessageAvailable(const nsACString& aMessage, bool aBinary); virtual nsresult - OnMessageAvailable(nsISupports* aContext, const nsACString& aMessage) MOZ_OVERRIDE; + OnMessageAvailable(nsISupports* aContext, const nsACString& aMessage) override; virtual nsresult - OnBinaryMessageAvailable(nsISupports* aContext, const nsACString& aMessage) MOZ_OVERRIDE; + OnBinaryMessageAvailable(nsISupports* aContext, const nsACString& aMessage) override; virtual nsresult OnSimpleEvent(nsISupports* aContext, const nsAString& aName); virtual nsresult - OnChannelConnected(nsISupports* aContext) MOZ_OVERRIDE; + OnChannelConnected(nsISupports* aContext) override; virtual nsresult - OnChannelClosed(nsISupports* aContext) MOZ_OVERRIDE; + OnChannelClosed(nsISupports* aContext) override; virtual void AppReady(); diff --git a/dom/base/nsDOMFileReader.h b/dom/base/nsDOMFileReader.h index 544f7188480c..0ba5d94fc992 100644 --- a/dom/base/nsDOMFileReader.h +++ b/dom/base/nsDOMFileReader.h @@ -51,18 +51,18 @@ public: NS_DECL_NSIINTERFACEREQUESTOR // FileIOObject overrides - virtual void DoAbort(nsAString& aEvent) MOZ_OVERRIDE; + virtual void DoAbort(nsAString& aEvent) override; - virtual nsresult DoReadData(nsIAsyncInputStream* aStream, uint64_t aCount) MOZ_OVERRIDE; + virtual nsresult DoReadData(nsIAsyncInputStream* aStream, uint64_t aCount) override; virtual nsresult DoOnLoadEnd(nsresult aStatus, nsAString& aSuccessEvent, - nsAString& aTerminationEvent) MOZ_OVERRIDE; + nsAString& aTerminationEvent) override; nsPIDOMWindow* GetParentObject() const { return GetOwner(); } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override; // WebIDL static already_AddRefed diff --git a/dom/base/nsDOMMutationObserver.h b/dom/base/nsDOMMutationObserver.h index a38bf5519f9a..47762d434c7b 100644 --- a/dom/base/nsDOMMutationObserver.h +++ b/dom/base/nsDOMMutationObserver.h @@ -30,7 +30,7 @@ class nsDOMMutationObserver; using mozilla::dom::MutationObservingInfo; -class nsDOMMutationRecord MOZ_FINAL : public nsISupports, +class nsDOMMutationRecord final : public nsISupports, public nsWrapperCache { virtual ~nsDOMMutationRecord() {} @@ -48,7 +48,7 @@ public: return mOwner; } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { return mozilla::dom::MutationRecordBinding::Wrap(aCx, this, aGivenProto); } @@ -364,7 +364,7 @@ public: virtual void AttributeSetToCurrentValue(nsIDocument* aDocument, mozilla::dom::Element* aElement, int32_t aNameSpaceID, - nsIAtom* aAttribute) MOZ_OVERRIDE + nsIAtom* aAttribute) override { // We can reuse AttributeWillChange implementation. AttributeWillChange(aDocument, aElement, aNameSpaceID, aAttribute, @@ -382,7 +382,7 @@ protected: aParent->AddClone(this); } - virtual void AddMutationObserver() MOZ_OVERRIDE + virtual void AddMutationObserver() override { mRegisterTarget->AddMutationObserver(this); } @@ -422,7 +422,7 @@ protected: nsAnimationReceiver(nsINode* aRegisterTarget, nsMutationReceiverBase* aParent) : nsMutationReceiver(aRegisterTarget, aParent) {} - virtual void AddMutationObserver() MOZ_OVERRIDE + virtual void AddMutationObserver() override { mRegisterTarget->AddAnimationObserver(this); } @@ -442,7 +442,7 @@ private: { 0x0c3b91f8, 0xcc3b, 0x4b08, \ { 0x9e, 0xab, 0x07, 0x47, 0xa9, 0xe4, 0x65, 0xb4 } } -class nsDOMMutationObserver MOZ_FINAL : public nsISupports, +class nsDOMMutationObserver final : public nsISupports, public nsWrapperCache { public: @@ -461,7 +461,7 @@ public: mozilla::dom::MutationCallback& aCb, mozilla::ErrorResult& aRv); - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { return mozilla::dom::MutationObserverBinding::Wrap(aCx, this, aGivenProto); } diff --git a/dom/base/nsDOMNavigationTiming.h b/dom/base/nsDOMNavigationTiming.h index 9c48d50f310c..7ae592c59d36 100644 --- a/dom/base/nsDOMNavigationTiming.h +++ b/dom/base/nsDOMNavigationTiming.h @@ -27,7 +27,7 @@ static const nsDOMPerformanceNavigationType TYPE_RESERVED = 255; } } -class nsDOMNavigationTiming MOZ_FINAL +class nsDOMNavigationTiming final { public: nsDOMNavigationTiming(); diff --git a/dom/base/nsDOMScriptObjectFactory.h b/dom/base/nsDOMScriptObjectFactory.h index 04ef3873d2e7..0ef6ead0f9c2 100644 --- a/dom/base/nsDOMScriptObjectFactory.h +++ b/dom/base/nsDOMScriptObjectFactory.h @@ -22,7 +22,7 @@ #include "nsIObserver.h" #include "mozilla/Attributes.h" -class nsDOMScriptObjectFactory MOZ_FINAL : public nsIDOMScriptObjectFactory, +class nsDOMScriptObjectFactory final : public nsIDOMScriptObjectFactory, public nsIObserver { ~nsDOMScriptObjectFactory() {} @@ -36,8 +36,8 @@ public: NS_DECL_NSIOBSERVER // nsIDOMScriptObjectFactory - NS_IMETHOD_(nsISupports *) GetClassInfoInstance(nsDOMClassInfoID aID) MOZ_OVERRIDE; - NS_IMETHOD_(nsISupports *) GetExternalClassInfoInstance(const nsAString& aName) MOZ_OVERRIDE; + NS_IMETHOD_(nsISupports *) GetClassInfoInstance(nsDOMClassInfoID aID) override; + NS_IMETHOD_(nsISupports *) GetExternalClassInfoInstance(const nsAString& aName) override; NS_IMETHOD RegisterDOMClassInfo(const char *aName, nsDOMClassInfoExternalConstructorFnc aConstructorFptr, @@ -45,6 +45,6 @@ public: const nsIID **aInterfaces, uint32_t aScriptableFlags, bool aHasClassInterface, - const nsCID *aConstructorCID) MOZ_OVERRIDE; + const nsCID *aConstructorCID) override; }; diff --git a/dom/base/nsDOMSerializer.h b/dom/base/nsDOMSerializer.h index 91f72bc5c541..1560998ed905 100644 --- a/dom/base/nsDOMSerializer.h +++ b/dom/base/nsDOMSerializer.h @@ -14,7 +14,7 @@ class nsINode; -class nsDOMSerializer MOZ_FINAL : public nsIDOMSerializer, +class nsDOMSerializer final : public nsIDOMSerializer, public nsWrapperCache { public: @@ -48,7 +48,7 @@ public: return mOwner; } - virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_OVERRIDE + virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { return mozilla::dom::XMLSerializerBinding::Wrap(aCx, this, aGivenProto); } diff --git a/dom/base/nsDOMSettableTokenList.h b/dom/base/nsDOMSettableTokenList.h index 68003fd4de67..8d7c40b84fef 100644 --- a/dom/base/nsDOMSettableTokenList.h +++ b/dom/base/nsDOMSettableTokenList.h @@ -15,14 +15,14 @@ class nsIAtom; // nsISupports must be on the primary inheritance chain // because nsDOMSettableTokenList is traversed by Element. -class nsDOMSettableTokenList MOZ_FINAL : public nsDOMTokenList +class nsDOMSettableTokenList final : public nsDOMTokenList { public: nsDOMSettableTokenList(mozilla::dom::Element* aElement, nsIAtom* aAttrAtom) : nsDOMTokenList(aElement, aAttrAtom) {} - virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) override; // WebIDL void GetValue(nsAString& aResult) { Stringify(aResult); } diff --git a/dom/base/nsDOMTokenList.h b/dom/base/nsDOMTokenList.h index f2a0181e3168..a53f9f9ba143 100644 --- a/dom/base/nsDOMTokenList.h +++ b/dom/base/nsDOMTokenList.h @@ -37,7 +37,7 @@ public: nsDOMTokenList(Element* aElement, nsIAtom* aAttrAtom); - virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) MOZ_OVERRIDE; + virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) override; Element* GetParentObject() { diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp index eca36f690d4f..7390a6f8e54b 100644 --- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp @@ -3772,7 +3772,7 @@ nsDOMWindowUtils::GetOMTAStyle(nsIDOMElement* aElement, namespace { -class HandlingUserInputHelper MOZ_FINAL : public nsIJSRAIIHelper +class HandlingUserInputHelper final : public nsIJSRAIIHelper { public: explicit HandlingUserInputHelper(bool aHandlingUserInput); diff --git a/dom/base/nsDOMWindowUtils.h b/dom/base/nsDOMWindowUtils.h index 3bb656c5ed98..e3b351e73d8c 100644 --- a/dom/base/nsDOMWindowUtils.h +++ b/dom/base/nsDOMWindowUtils.h @@ -26,7 +26,7 @@ namespace mozilla { } } -class nsTranslationNodeList MOZ_FINAL : public nsITranslationNodeList +class nsTranslationNodeList final : public nsITranslationNodeList { public: nsTranslationNodeList() @@ -54,7 +54,7 @@ private: uint32_t mLength; }; -class nsDOMWindowUtils MOZ_FINAL : public nsIDOMWindowUtils, +class nsDOMWindowUtils final : public nsIDOMWindowUtils, public nsSupportsWeakReference { typedef mozilla::widget::TextEventDispatcher diff --git a/dom/base/nsDataDocumentContentPolicy.h b/dom/base/nsDataDocumentContentPolicy.h index 224897e9c8e2..5ccdede2325d 100644 --- a/dom/base/nsDataDocumentContentPolicy.h +++ b/dom/base/nsDataDocumentContentPolicy.h @@ -22,7 +22,7 @@ #include "nsIContentPolicy.h" #include "mozilla/Attributes.h" -class nsDataDocumentContentPolicy MOZ_FINAL : public nsIContentPolicy +class nsDataDocumentContentPolicy final : public nsIContentPolicy { ~nsDataDocumentContentPolicy() {} diff --git a/dom/base/nsDocElementCreatedNotificationRunner.h b/dom/base/nsDocElementCreatedNotificationRunner.h index af3cb3bbb14b..539219b12336 100644 --- a/dom/base/nsDocElementCreatedNotificationRunner.h +++ b/dom/base/nsDocElementCreatedNotificationRunner.h @@ -21,7 +21,7 @@ public: { } - NS_IMETHOD Run() MOZ_OVERRIDE + NS_IMETHOD Run() override { nsContentSink::NotifyDocElementCreated(mDoc); return NS_OK; diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index cc332c4825b4..27f3d357d902 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -1429,7 +1429,7 @@ nsExternalResourceMap::ExternalResource::~ExternalResource() // If we ever have an nsIDocumentObserver notification for stylesheet title // changes we should update the list from that instead of overriding // EnsureFresh. -class nsDOMStyleSheetSetList MOZ_FINAL : public DOMStringList +class nsDOMStyleSheetSetList final : public DOMStringList { public: explicit nsDOMStyleSheetSetList(nsIDocument* aDocument); @@ -1439,7 +1439,7 @@ public: mDocument = nullptr; } - virtual void EnsureFresh() MOZ_OVERRIDE; + virtual void EnsureFresh() override; protected: nsIDocument* mDocument; // Our document; weak ref. It'll let us know if it @@ -1489,7 +1489,7 @@ void nsIDocument::SelectorCache::CacheList(const nsAString& aSelector, AddObject(key); } -class nsIDocument::SelectorCacheKeyDeleter MOZ_FINAL : public nsRunnable +class nsIDocument::SelectorCacheKeyDeleter final : public nsRunnable { public: explicit SelectorCacheKeyDeleter(SelectorCacheKey* aToDelete) @@ -5922,7 +5922,7 @@ nsDocument::RegisterUnresolvedElement(Element* aElement, nsIAtom* aTypeName) namespace { -class ProcessStackRunner MOZ_FINAL : public nsIRunnable +class ProcessStackRunner final : public nsIRunnable { ~ProcessStackRunner() {} public: @@ -5931,7 +5931,7 @@ public: { } NS_DECL_ISUPPORTS - NS_IMETHOD Run() MOZ_OVERRIDE + NS_IMETHOD Run() override { nsDocument::ProcessTopElementQueue(mIsBaseQueue); return NS_OK; @@ -9865,11 +9865,11 @@ namespace { * Stub for LoadSheet(), since all we want is to get the sheet into * the CSSLoader's style cache */ -class StubCSSLoaderObserver MOZ_FINAL : public nsICSSLoaderObserver { +class StubCSSLoaderObserver final : public nsICSSLoaderObserver { ~StubCSSLoaderObserver() {} public: NS_IMETHOD - StyleSheetLoaded(CSSStyleSheet*, bool, nsresult) MOZ_OVERRIDE + StyleSheetLoaded(CSSStyleSheet*, bool, nsresult) override { return NS_OK; } @@ -12009,7 +12009,7 @@ public: NS_DECL_ISUPPORTS_INHERITED NS_DECL_NSICONTENTPERMISSIONREQUEST - NS_IMETHOD Run() MOZ_OVERRIDE + NS_IMETHOD Run() override { nsCOMPtr e = do_QueryReferent(mElement); nsCOMPtr d = do_QueryReferent(mDocument); diff --git a/dom/base/nsDocument.h b/dom/base/nsDocument.h index bcb97031a6f7..cc048458bb65 100644 --- a/dom/base/nsDocument.h +++ b/dom/base/nsDocument.h @@ -455,14 +455,14 @@ public: // nsIMutationObserver NS_DECL_NSIMUTATIONOBSERVER_NODEWILLBEDESTROYED - virtual nsINode* GetParentObject() const MOZ_OVERRIDE + virtual nsINode* GetParentObject() const override { return mDocument; } - virtual uint32_t Length() MOZ_OVERRIDE; + virtual uint32_t Length() override; virtual mozilla::CSSStyleSheet* - IndexedGetter(uint32_t aIndex, bool& aFound) MOZ_OVERRIDE; + IndexedGetter(uint32_t aIndex, bool& aFound) override; protected: virtual ~nsDOMStyleSheetList(); @@ -471,7 +471,7 @@ protected: nsIDocument* mDocument; }; -class nsOnloadBlocker MOZ_FINAL : public nsIRequest +class nsOnloadBlocker final : public nsIRequest { public: nsOnloadBlocker() {} @@ -575,7 +575,7 @@ protected: }; friend class PendingLoad; - class LoadgroupCallbacks MOZ_FINAL : public nsIInterfaceRequestor + class LoadgroupCallbacks final : public nsIInterfaceRequestor { ~LoadgroupCallbacks() {} public: @@ -597,7 +597,7 @@ protected: // XXXbz I wish we could just derive the _allcaps thing from _i #define DECL_SHIM(_i, _allcaps) \ - class _i##Shim MOZ_FINAL : public nsIInterfaceRequestor, \ + class _i##Shim final : public nsIInterfaceRequestor, \ public _i \ { \ ~_i##Shim() {} \ @@ -693,9 +693,9 @@ public: NS_DECL_SIZEOF_EXCLUDING_THIS - virtual void Reset(nsIChannel *aChannel, nsILoadGroup *aLoadGroup) MOZ_OVERRIDE; + virtual void Reset(nsIChannel *aChannel, nsILoadGroup *aLoadGroup) override; virtual void ResetToURI(nsIURI *aURI, nsILoadGroup *aLoadGroup, - nsIPrincipal* aPrincipal) MOZ_OVERRIDE; + nsIPrincipal* aPrincipal) override; // StartDocumentLoad is pure virtual so that subclasses must override it. // The nsDocument StartDocumentLoad does some setup, but does NOT set @@ -706,22 +706,22 @@ public: nsISupports* aContainer, nsIStreamListener **aDocListener, bool aReset = true, - nsIContentSink* aContentSink = nullptr) MOZ_OVERRIDE = 0; + nsIContentSink* aContentSink = nullptr) override = 0; - virtual void StopDocumentLoad() MOZ_OVERRIDE; + virtual void StopDocumentLoad() override; - virtual void NotifyPossibleTitleChange(bool aBoundTitleElement) MOZ_OVERRIDE; + virtual void NotifyPossibleTitleChange(bool aBoundTitleElement) override; - virtual void SetDocumentURI(nsIURI* aURI) MOZ_OVERRIDE; + virtual void SetDocumentURI(nsIURI* aURI) override; - virtual void SetChromeXHRDocURI(nsIURI* aURI) MOZ_OVERRIDE; + virtual void SetChromeXHRDocURI(nsIURI* aURI) override; - virtual void SetChromeXHRDocBaseURI(nsIURI* aURI) MOZ_OVERRIDE; + virtual void SetChromeXHRDocBaseURI(nsIURI* aURI) override; /** * Set the principal responsible for this document. */ - virtual void SetPrincipal(nsIPrincipal *aPrincipal) MOZ_OVERRIDE; + virtual void SetPrincipal(nsIPrincipal *aPrincipal) override; /** * Get the Content-Type of this document. @@ -732,43 +732,43 @@ public: /** * Set the Content-Type of this document. */ - virtual void SetContentType(const nsAString& aContentType) MOZ_OVERRIDE; + virtual void SetContentType(const nsAString& aContentType) override; - virtual nsresult SetBaseURI(nsIURI* aURI) MOZ_OVERRIDE; + virtual nsresult SetBaseURI(nsIURI* aURI) override; /** * Get/Set the base target of a link in a document. */ - virtual void GetBaseTarget(nsAString &aBaseTarget) MOZ_OVERRIDE; + virtual void GetBaseTarget(nsAString &aBaseTarget) override; /** * Return a standard name for the document's character set. This will * trigger a startDocumentLoad if necessary to answer the question. */ - virtual void SetDocumentCharacterSet(const nsACString& aCharSetID) MOZ_OVERRIDE; + virtual void SetDocumentCharacterSet(const nsACString& aCharSetID) override; /** * Add an observer that gets notified whenever the charset changes. */ - virtual nsresult AddCharSetObserver(nsIObserver* aObserver) MOZ_OVERRIDE; + virtual nsresult AddCharSetObserver(nsIObserver* aObserver) override; /** * Remove a charset observer. */ - virtual void RemoveCharSetObserver(nsIObserver* aObserver) MOZ_OVERRIDE; + virtual void RemoveCharSetObserver(nsIObserver* aObserver) override; virtual Element* AddIDTargetObserver(nsIAtom* aID, IDTargetObserver aObserver, - void* aData, bool aForImage) MOZ_OVERRIDE; + void* aData, bool aForImage) override; virtual void RemoveIDTargetObserver(nsIAtom* aID, IDTargetObserver aObserver, - void* aData, bool aForImage) MOZ_OVERRIDE; + void* aData, bool aForImage) override; /** * Access HTTP header data (this may also get set from other sources, like * HTML META tags). */ - virtual void GetHeaderData(nsIAtom* aHeaderField, nsAString& aData) const MOZ_OVERRIDE; + virtual void GetHeaderData(nsIAtom* aHeaderField, nsAString& aData) const override; virtual void SetHeaderData(nsIAtom* aheaderField, - const nsAString& aData) MOZ_OVERRIDE; + const nsAString& aData) override; /** * Create a new presentation shell that will use aContext for @@ -777,140 +777,140 @@ public: */ virtual already_AddRefed CreateShell(nsPresContext* aContext, nsViewManager* aViewManager, - nsStyleSet* aStyleSet) MOZ_OVERRIDE; - virtual void DeleteShell() MOZ_OVERRIDE; + nsStyleSet* aStyleSet) override; + virtual void DeleteShell() override; - virtual nsresult GetAllowPlugins(bool* aAllowPlugins) MOZ_OVERRIDE; + virtual nsresult GetAllowPlugins(bool* aAllowPlugins) override; - virtual already_AddRefed GetUndoManager() MOZ_OVERRIDE; + virtual already_AddRefed GetUndoManager() override; static bool IsWebAnimationsEnabled(JSContext* aCx, JSObject* aObject); - virtual mozilla::dom::AnimationTimeline* Timeline() MOZ_OVERRIDE; + virtual mozilla::dom::AnimationTimeline* Timeline() override; virtual nsresult SetSubDocumentFor(Element* aContent, - nsIDocument* aSubDoc) MOZ_OVERRIDE; - virtual nsIDocument* GetSubDocumentFor(nsIContent* aContent) const MOZ_OVERRIDE; - virtual Element* FindContentForSubDocument(nsIDocument *aDocument) const MOZ_OVERRIDE; - virtual Element* GetRootElementInternal() const MOZ_OVERRIDE; + nsIDocument* aSubDoc) override; + virtual nsIDocument* GetSubDocumentFor(nsIContent* aContent) const override; + virtual Element* FindContentForSubDocument(nsIDocument *aDocument) const override; + virtual Element* GetRootElementInternal() const override; - virtual void EnsureOnDemandBuiltInUASheet(mozilla::CSSStyleSheet* aSheet) MOZ_OVERRIDE; + virtual void EnsureOnDemandBuiltInUASheet(mozilla::CSSStyleSheet* aSheet) override; /** * Get the (document) style sheets owned by this document. * These are ordered, highest priority last */ - virtual int32_t GetNumberOfStyleSheets() const MOZ_OVERRIDE; - virtual nsIStyleSheet* GetStyleSheetAt(int32_t aIndex) const MOZ_OVERRIDE; - virtual int32_t GetIndexOfStyleSheet(nsIStyleSheet* aSheet) const MOZ_OVERRIDE; - virtual void AddStyleSheet(nsIStyleSheet* aSheet) MOZ_OVERRIDE; - virtual void RemoveStyleSheet(nsIStyleSheet* aSheet) MOZ_OVERRIDE; + virtual int32_t GetNumberOfStyleSheets() const override; + virtual nsIStyleSheet* GetStyleSheetAt(int32_t aIndex) const override; + virtual int32_t GetIndexOfStyleSheet(nsIStyleSheet* aSheet) const override; + virtual void AddStyleSheet(nsIStyleSheet* aSheet) override; + virtual void RemoveStyleSheet(nsIStyleSheet* aSheet) override; virtual void UpdateStyleSheets(nsCOMArray& aOldSheets, - nsCOMArray& aNewSheets) MOZ_OVERRIDE; + nsCOMArray& aNewSheets) override; virtual void AddStyleSheetToStyleSets(nsIStyleSheet* aSheet); virtual void RemoveStyleSheetFromStyleSets(nsIStyleSheet* aSheet); - virtual void InsertStyleSheetAt(nsIStyleSheet* aSheet, int32_t aIndex) MOZ_OVERRIDE; + virtual void InsertStyleSheetAt(nsIStyleSheet* aSheet, int32_t aIndex) override; virtual void SetStyleSheetApplicableState(nsIStyleSheet* aSheet, - bool aApplicable) MOZ_OVERRIDE; + bool aApplicable) override; - virtual nsresult LoadAdditionalStyleSheet(additionalSheetType aType, nsIURI* aSheetURI) MOZ_OVERRIDE; - virtual nsresult AddAdditionalStyleSheet(additionalSheetType aType, nsIStyleSheet* aSheet) MOZ_OVERRIDE; - virtual void RemoveAdditionalStyleSheet(additionalSheetType aType, nsIURI* sheetURI) MOZ_OVERRIDE; - virtual nsIStyleSheet* FirstAdditionalAuthorSheet() MOZ_OVERRIDE; + virtual nsresult LoadAdditionalStyleSheet(additionalSheetType aType, nsIURI* aSheetURI) override; + virtual nsresult AddAdditionalStyleSheet(additionalSheetType aType, nsIStyleSheet* aSheet) override; + virtual void RemoveAdditionalStyleSheet(additionalSheetType aType, nsIURI* sheetURI) override; + virtual nsIStyleSheet* FirstAdditionalAuthorSheet() override; - virtual nsIChannel* GetChannel() const MOZ_OVERRIDE { + virtual nsIChannel* GetChannel() const override { return mChannel; } - virtual nsIChannel* GetFailedChannel() const MOZ_OVERRIDE { + virtual nsIChannel* GetFailedChannel() const override { return mFailedChannel; } - virtual void SetFailedChannel(nsIChannel* aChannel) MOZ_OVERRIDE { + virtual void SetFailedChannel(nsIChannel* aChannel) override { mFailedChannel = aChannel; } - virtual void SetScriptGlobalObject(nsIScriptGlobalObject* aGlobalObject) MOZ_OVERRIDE; + virtual void SetScriptGlobalObject(nsIScriptGlobalObject* aGlobalObject) override; - virtual void SetScriptHandlingObject(nsIScriptGlobalObject* aScriptObject) MOZ_OVERRIDE; + virtual void SetScriptHandlingObject(nsIScriptGlobalObject* aScriptObject) override; - virtual nsIGlobalObject* GetScopeObject() const MOZ_OVERRIDE; - void SetScopeObject(nsIGlobalObject* aGlobal) MOZ_OVERRIDE; + virtual nsIGlobalObject* GetScopeObject() const override; + void SetScopeObject(nsIGlobalObject* aGlobal) override; /** * Get the script loader for this document */ - virtual nsScriptLoader* ScriptLoader() MOZ_OVERRIDE; + virtual nsScriptLoader* ScriptLoader() override; /** * Add/Remove an element to the document's id and name hashes */ - virtual void AddToIdTable(Element* aElement, nsIAtom* aId) MOZ_OVERRIDE; - virtual void RemoveFromIdTable(Element* aElement, nsIAtom* aId) MOZ_OVERRIDE; - virtual void AddToNameTable(Element* aElement, nsIAtom* aName) MOZ_OVERRIDE; - virtual void RemoveFromNameTable(Element* aElement, nsIAtom* aName) MOZ_OVERRIDE; + virtual void AddToIdTable(Element* aElement, nsIAtom* aId) override; + virtual void RemoveFromIdTable(Element* aElement, nsIAtom* aId) override; + virtual void AddToNameTable(Element* aElement, nsIAtom* aName) override; + virtual void RemoveFromNameTable(Element* aElement, nsIAtom* aName) override; /** * Add a new observer of document change notifications. Whenever * content is changed, appended, inserted or removed the observers are * informed. */ - virtual void AddObserver(nsIDocumentObserver* aObserver) MOZ_OVERRIDE; + virtual void AddObserver(nsIDocumentObserver* aObserver) override; /** * Remove an observer of document change notifications. This will * return false if the observer cannot be found. */ - virtual bool RemoveObserver(nsIDocumentObserver* aObserver) MOZ_OVERRIDE; + virtual bool RemoveObserver(nsIDocumentObserver* aObserver) override; // Observation hooks used to propagate notifications to document // observers. - virtual void BeginUpdate(nsUpdateType aUpdateType) MOZ_OVERRIDE; - virtual void EndUpdate(nsUpdateType aUpdateType) MOZ_OVERRIDE; - virtual void BeginLoad() MOZ_OVERRIDE; - virtual void EndLoad() MOZ_OVERRIDE; + virtual void BeginUpdate(nsUpdateType aUpdateType) override; + virtual void EndUpdate(nsUpdateType aUpdateType) override; + virtual void BeginLoad() override; + virtual void EndLoad() override; - virtual void SetReadyStateInternal(ReadyState rs) MOZ_OVERRIDE; + virtual void SetReadyStateInternal(ReadyState rs) override; virtual void ContentStateChanged(nsIContent* aContent, mozilla::EventStates aStateMask) - MOZ_OVERRIDE; + override; virtual void DocumentStatesChanged( - mozilla::EventStates aStateMask) MOZ_OVERRIDE; + mozilla::EventStates aStateMask) override; virtual void StyleRuleChanged(nsIStyleSheet* aStyleSheet, nsIStyleRule* aOldStyleRule, - nsIStyleRule* aNewStyleRule) MOZ_OVERRIDE; + nsIStyleRule* aNewStyleRule) override; virtual void StyleRuleAdded(nsIStyleSheet* aStyleSheet, - nsIStyleRule* aStyleRule) MOZ_OVERRIDE; + nsIStyleRule* aStyleRule) override; virtual void StyleRuleRemoved(nsIStyleSheet* aStyleSheet, - nsIStyleRule* aStyleRule) MOZ_OVERRIDE; + nsIStyleRule* aStyleRule) override; - virtual void FlushPendingNotifications(mozFlushType aType) MOZ_OVERRIDE; - virtual void FlushExternalResources(mozFlushType aType) MOZ_OVERRIDE; + virtual void FlushPendingNotifications(mozFlushType aType) override; + virtual void FlushExternalResources(mozFlushType aType) override; virtual void SetXMLDeclaration(const char16_t *aVersion, const char16_t *aEncoding, - const int32_t aStandalone) MOZ_OVERRIDE; + const int32_t aStandalone) override; virtual void GetXMLDeclaration(nsAString& aVersion, nsAString& aEncoding, - nsAString& Standalone) MOZ_OVERRIDE; - virtual bool IsScriptEnabled() MOZ_OVERRIDE; + nsAString& Standalone) override; + virtual bool IsScriptEnabled() override; - virtual void OnPageShow(bool aPersisted, mozilla::dom::EventTarget* aDispatchStartTarget) MOZ_OVERRIDE; - virtual void OnPageHide(bool aPersisted, mozilla::dom::EventTarget* aDispatchStartTarget) MOZ_OVERRIDE; + virtual void OnPageShow(bool aPersisted, mozilla::dom::EventTarget* aDispatchStartTarget) override; + virtual void OnPageHide(bool aPersisted, mozilla::dom::EventTarget* aDispatchStartTarget) override; - virtual void WillDispatchMutationEvent(nsINode* aTarget) MOZ_OVERRIDE; - virtual void MutationEventDispatched(nsINode* aTarget) MOZ_OVERRIDE; + virtual void WillDispatchMutationEvent(nsINode* aTarget) override; + virtual void MutationEventDispatched(nsINode* aTarget) override; // nsINode - virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE; - virtual nsIContent *GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE; - virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const MOZ_OVERRIDE; - virtual int32_t IndexOf(const nsINode* aPossibleChild) const MOZ_OVERRIDE; - virtual uint32_t GetChildCount() const MOZ_OVERRIDE; + virtual bool IsNodeOfType(uint32_t aFlags) const override; + virtual nsIContent *GetChildAt(uint32_t aIndex) const override; + virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const override; + virtual int32_t IndexOf(const nsINode* aPossibleChild) const override; + virtual uint32_t GetChildCount() const override; virtual nsresult InsertChildAt(nsIContent* aKid, uint32_t aIndex, - bool aNotify) MOZ_OVERRIDE; - virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) MOZ_OVERRIDE; - virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE + bool aNotify) override; + virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) override; + virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const override { return NS_ERROR_NOT_IMPLEMENTED; } @@ -918,32 +918,32 @@ public: // nsIRadioGroupContainer NS_IMETHOD WalkRadioGroup(const nsAString& aName, nsIRadioVisitor* aVisitor, - bool aFlushContent) MOZ_OVERRIDE; + bool aFlushContent) override; virtual void SetCurrentRadioButton(const nsAString& aName, - mozilla::dom::HTMLInputElement* aRadio) MOZ_OVERRIDE; + mozilla::dom::HTMLInputElement* aRadio) override; virtual mozilla::dom::HTMLInputElement* - GetCurrentRadioButton(const nsAString& aName) MOZ_OVERRIDE; + GetCurrentRadioButton(const nsAString& aName) override; NS_IMETHOD GetNextRadioButton(const nsAString& aName, const bool aPrevious, mozilla::dom::HTMLInputElement* aFocusedRadio, - mozilla::dom::HTMLInputElement** aRadioOut) MOZ_OVERRIDE; + mozilla::dom::HTMLInputElement** aRadioOut) override; virtual void AddToRadioGroup(const nsAString& aName, - nsIFormControl* aRadio) MOZ_OVERRIDE; + nsIFormControl* aRadio) override; virtual void RemoveFromRadioGroup(const nsAString& aName, - nsIFormControl* aRadio) MOZ_OVERRIDE; - virtual uint32_t GetRequiredRadioCount(const nsAString& aName) const MOZ_OVERRIDE; + nsIFormControl* aRadio) override; + virtual uint32_t GetRequiredRadioCount(const nsAString& aName) const override; virtual void RadioRequiredWillChange(const nsAString& aName, - bool aRequiredAdded) MOZ_OVERRIDE; - virtual bool GetValueMissingState(const nsAString& aName) const MOZ_OVERRIDE; - virtual void SetValueMissingState(const nsAString& aName, bool aValue) MOZ_OVERRIDE; + bool aRequiredAdded) override; + virtual bool GetValueMissingState(const nsAString& aName) const override; + virtual void SetValueMissingState(const nsAString& aName, bool aValue) override; // for radio group nsRadioGroupStruct* GetRadioGroup(const nsAString& aName) const; nsRadioGroupStruct* GetOrCreateRadioGroup(const nsAString& aName); - virtual nsViewportInfo GetViewportInfo(const mozilla::ScreenIntSize& aDisplaySize) MOZ_OVERRIDE; + virtual nsViewportInfo GetViewportInfo(const mozilla::ScreenIntSize& aDisplaySize) override; /** * Called when an app-theme-changed observer notification is @@ -971,14 +971,14 @@ public: // nsIDOMEventTarget virtual nsresult PreHandleEvent( - mozilla::EventChainPreVisitor& aVisitor) MOZ_OVERRIDE; + mozilla::EventChainPreVisitor& aVisitor) override; virtual mozilla::EventListenerManager* - GetOrCreateListenerManager() MOZ_OVERRIDE; + GetOrCreateListenerManager() override; virtual mozilla::EventListenerManager* - GetExistingListenerManager() const MOZ_OVERRIDE; + GetExistingListenerManager() const override; // nsIScriptObjectPrincipal - virtual nsIPrincipal* GetPrincipal() MOZ_OVERRIDE; + virtual nsIPrincipal* GetPrincipal() override; // nsIApplicationCacheContainer NS_DECL_NSIAPPLICATIONCACHECONTAINER @@ -992,80 +992,80 @@ public: virtual nsresult CreateElem(const nsAString& aName, nsIAtom *aPrefix, int32_t aNamespaceID, - nsIContent **aResult) MOZ_OVERRIDE; + nsIContent **aResult) override; - virtual void Sanitize() MOZ_OVERRIDE; + virtual void Sanitize() override; virtual void EnumerateSubDocuments(nsSubDocEnumFunc aCallback, - void *aData) MOZ_OVERRIDE; + void *aData) override; - virtual bool CanSavePresentation(nsIRequest *aNewRequest) MOZ_OVERRIDE; - virtual void Destroy() MOZ_OVERRIDE; - virtual void RemovedFromDocShell() MOZ_OVERRIDE; - virtual already_AddRefed GetLayoutHistoryState() const MOZ_OVERRIDE; + virtual bool CanSavePresentation(nsIRequest *aNewRequest) override; + virtual void Destroy() override; + virtual void RemovedFromDocShell() override; + virtual already_AddRefed GetLayoutHistoryState() const override; - virtual void BlockOnload() MOZ_OVERRIDE; - virtual void UnblockOnload(bool aFireSync) MOZ_OVERRIDE; + virtual void BlockOnload() override; + virtual void UnblockOnload(bool aFireSync) override; - virtual void AddStyleRelevantLink(mozilla::dom::Link* aLink) MOZ_OVERRIDE; - virtual void ForgetLink(mozilla::dom::Link* aLink) MOZ_OVERRIDE; + virtual void AddStyleRelevantLink(mozilla::dom::Link* aLink) override; + virtual void ForgetLink(mozilla::dom::Link* aLink) override; - virtual void ClearBoxObjectFor(nsIContent* aContent) MOZ_OVERRIDE; + virtual void ClearBoxObjectFor(nsIContent* aContent) override; virtual already_AddRefed GetBoxObjectFor(mozilla::dom::Element* aElement, - mozilla::ErrorResult& aRv) MOZ_OVERRIDE; + mozilla::ErrorResult& aRv) override; virtual Element* GetAnonymousElementByAttribute(nsIContent* aElement, nsIAtom* aAttrName, - const nsAString& aAttrValue) const MOZ_OVERRIDE; + const nsAString& aAttrValue) const override; virtual Element* ElementFromPointHelper(float aX, float aY, bool aIgnoreRootScrollFrame, - bool aFlushLayout) MOZ_OVERRIDE; + bool aFlushLayout) override; virtual nsresult NodesFromRectHelper(float aX, float aY, float aTopSize, float aRightSize, float aBottomSize, float aLeftSize, bool aIgnoreRootScrollFrame, bool aFlushLayout, - nsIDOMNodeList** aReturn) MOZ_OVERRIDE; + nsIDOMNodeList** aReturn) override; - virtual void FlushSkinBindings() MOZ_OVERRIDE; + virtual void FlushSkinBindings() override; - virtual nsresult InitializeFrameLoader(nsFrameLoader* aLoader) MOZ_OVERRIDE; - virtual nsresult FinalizeFrameLoader(nsFrameLoader* aLoader, nsIRunnable* aFinalizer) MOZ_OVERRIDE; - virtual void TryCancelFrameLoaderInitialization(nsIDocShell* aShell) MOZ_OVERRIDE; + virtual nsresult InitializeFrameLoader(nsFrameLoader* aLoader) override; + virtual nsresult FinalizeFrameLoader(nsFrameLoader* aLoader, nsIRunnable* aFinalizer) override; + virtual void TryCancelFrameLoaderInitialization(nsIDocShell* aShell) override; virtual nsIDocument* RequestExternalResource(nsIURI* aURI, nsINode* aRequestingNode, - ExternalResourceLoad** aPendingLoad) MOZ_OVERRIDE; + ExternalResourceLoad** aPendingLoad) override; virtual void - EnumerateExternalResources(nsSubDocEnumFunc aCallback, void* aData) MOZ_OVERRIDE; + EnumerateExternalResources(nsSubDocEnumFunc aCallback, void* aData) override; nsTArray mHostObjectURIs; // Returns our (lazily-initialized) animation controller. // If HasAnimationController is true, this is guaranteed to return non-null. - nsSMILAnimationController* GetAnimationController() MOZ_OVERRIDE; + nsSMILAnimationController* GetAnimationController() override; virtual mozilla::PendingPlayerTracker* - GetPendingPlayerTracker() MOZ_FINAL MOZ_OVERRIDE + GetPendingPlayerTracker() final override { return mPendingPlayerTracker; } virtual mozilla::PendingPlayerTracker* - GetOrCreatePendingPlayerTracker() MOZ_OVERRIDE; + GetOrCreatePendingPlayerTracker() override; - void SetImagesNeedAnimating(bool aAnimating) MOZ_OVERRIDE; + void SetImagesNeedAnimating(bool aAnimating) override; virtual void SuppressEventHandling(SuppressionType aWhat, - uint32_t aIncrease) MOZ_OVERRIDE; + uint32_t aIncrease) override; virtual void UnsuppressEventHandlingAndFireEvents(SuppressionType aWhat, - bool aFireEvents) MOZ_OVERRIDE; + bool aFireEvents) override; void DecreaseEventSuppression() { MOZ_ASSERT(mEventsSuppressed); @@ -1079,7 +1079,7 @@ public: MaybeRescheduleAnimationFrameNotifications(); } - virtual nsIDocument* GetTemplateContentsOwner() MOZ_OVERRIDE; + virtual nsIDocument* GetTemplateContentsOwner() override; NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsDocument, nsIDocument) @@ -1103,89 +1103,89 @@ public: void MaybeEndOutermostXBLUpdate(); - virtual void PreloadPictureOpened() MOZ_OVERRIDE; - virtual void PreloadPictureClosed() MOZ_OVERRIDE; + virtual void PreloadPictureOpened() override; + virtual void PreloadPictureClosed() override; virtual void PreloadPictureImageSource(const nsAString& aSrcsetAttr, const nsAString& aSizesAttr, const nsAString& aTypeAttr, - const nsAString& aMediaAttr) MOZ_OVERRIDE; + const nsAString& aMediaAttr) override; virtual already_AddRefed ResolvePreloadImage(nsIURI *aBaseURI, const nsAString& aSrcAttr, const nsAString& aSrcsetAttr, - const nsAString& aSizesAttr) MOZ_OVERRIDE; + const nsAString& aSizesAttr) override; virtual void MaybePreLoadImage(nsIURI* uri, const nsAString &aCrossOriginAttr, - ReferrerPolicy aReferrerPolicy) MOZ_OVERRIDE; - virtual void ForgetImagePreload(nsIURI* aURI) MOZ_OVERRIDE; + ReferrerPolicy aReferrerPolicy) override; + virtual void ForgetImagePreload(nsIURI* aURI) override; virtual void PreloadStyle(nsIURI* uri, const nsAString& charset, const nsAString& aCrossOriginAttr, - ReferrerPolicy aReferrerPolicy) MOZ_OVERRIDE; + ReferrerPolicy aReferrerPolicy) override; virtual nsresult LoadChromeSheetSync(nsIURI* uri, bool isAgentSheet, - mozilla::CSSStyleSheet** sheet) MOZ_OVERRIDE; + mozilla::CSSStyleSheet** sheet) override; - virtual nsISupports* GetCurrentContentSink() MOZ_OVERRIDE; + virtual nsISupports* GetCurrentContentSink() override; - virtual mozilla::EventStates GetDocumentState() MOZ_OVERRIDE; + virtual mozilla::EventStates GetDocumentState() override; - virtual void RegisterHostObjectUri(const nsACString& aUri) MOZ_OVERRIDE; - virtual void UnregisterHostObjectUri(const nsACString& aUri) MOZ_OVERRIDE; + virtual void RegisterHostObjectUri(const nsACString& aUri) override; + virtual void UnregisterHostObjectUri(const nsACString& aUri) override; // Only BlockOnload should call this! void AsyncBlockOnload(); - virtual void SetScrollToRef(nsIURI *aDocumentURI) MOZ_OVERRIDE; - virtual void ScrollToRef() MOZ_OVERRIDE; - virtual void ResetScrolledToRefAlready() MOZ_OVERRIDE; - virtual void SetChangeScrollPosWhenScrollingToRef(bool aValue) MOZ_OVERRIDE; + virtual void SetScrollToRef(nsIURI *aDocumentURI) override; + virtual void ScrollToRef() override; + virtual void ResetScrolledToRefAlready() override; + virtual void SetChangeScrollPosWhenScrollingToRef(bool aValue) override; - virtual Element *GetElementById(const nsAString& aElementId) MOZ_OVERRIDE; - virtual const nsSmallVoidArray* GetAllElementsForId(const nsAString& aElementId) const MOZ_OVERRIDE; + virtual Element *GetElementById(const nsAString& aElementId) override; + virtual const nsSmallVoidArray* GetAllElementsForId(const nsAString& aElementId) const override; - virtual Element *LookupImageElement(const nsAString& aElementId) MOZ_OVERRIDE; + virtual Element *LookupImageElement(const nsAString& aElementId) override; virtual void MozSetImageElement(const nsAString& aImageElementId, - Element* aElement) MOZ_OVERRIDE; + Element* aElement) override; - virtual nsresult AddImage(imgIRequest* aImage) MOZ_OVERRIDE; - virtual nsresult RemoveImage(imgIRequest* aImage, uint32_t aFlags) MOZ_OVERRIDE; - virtual nsresult SetImageLockingState(bool aLocked) MOZ_OVERRIDE; + virtual nsresult AddImage(imgIRequest* aImage) override; + virtual nsresult RemoveImage(imgIRequest* aImage, uint32_t aFlags) override; + virtual nsresult SetImageLockingState(bool aLocked) override; // AddPlugin adds a plugin-related element to mPlugins when the element is // added to the tree. - virtual nsresult AddPlugin(nsIObjectLoadingContent* aPlugin) MOZ_OVERRIDE; + virtual nsresult AddPlugin(nsIObjectLoadingContent* aPlugin) override; // RemovePlugin removes a plugin-related element to mPlugins when the // element is removed from the tree. - virtual void RemovePlugin(nsIObjectLoadingContent* aPlugin) MOZ_OVERRIDE; + virtual void RemovePlugin(nsIObjectLoadingContent* aPlugin) override; // GetPlugins returns the plugin-related elements from // the frame and any subframes. - virtual void GetPlugins(nsTArray& aPlugins) MOZ_OVERRIDE; + virtual void GetPlugins(nsTArray& aPlugins) override; - virtual nsresult GetStateObject(nsIVariant** aResult) MOZ_OVERRIDE; + virtual nsresult GetStateObject(nsIVariant** aResult) override; - virtual nsDOMNavigationTiming* GetNavigationTiming() const MOZ_OVERRIDE; - virtual nsresult SetNavigationTiming(nsDOMNavigationTiming* aTiming) MOZ_OVERRIDE; + virtual nsDOMNavigationTiming* GetNavigationTiming() const override; + virtual nsresult SetNavigationTiming(nsDOMNavigationTiming* aTiming) override; - virtual Element* FindImageMap(const nsAString& aNormalizedMapName) MOZ_OVERRIDE; + virtual Element* FindImageMap(const nsAString& aNormalizedMapName) override; - virtual Element* GetFullScreenElement() MOZ_OVERRIDE; + virtual Element* GetFullScreenElement() override; virtual void AsyncRequestFullScreen(Element* aElement, - mozilla::dom::FullScreenOptions& aOptions) MOZ_OVERRIDE; - virtual void RestorePreviousFullScreenState() MOZ_OVERRIDE; - virtual bool IsFullscreenLeaf() MOZ_OVERRIDE; - virtual bool IsFullScreenDoc() MOZ_OVERRIDE; - virtual void SetApprovedForFullscreen(bool aIsApproved) MOZ_OVERRIDE; + mozilla::dom::FullScreenOptions& aOptions) override; + virtual void RestorePreviousFullScreenState() override; + virtual bool IsFullscreenLeaf() override; + virtual bool IsFullScreenDoc() override; + virtual void SetApprovedForFullscreen(bool aIsApproved) override; virtual nsresult RemoteFrameFullscreenChanged(nsIDOMElement* aFrameElement, - const nsAString& aNewOrigin) MOZ_OVERRIDE; + const nsAString& aNewOrigin) override; - virtual nsresult RemoteFrameFullscreenReverted() MOZ_OVERRIDE; - virtual nsIDocument* GetFullscreenRoot() MOZ_OVERRIDE; - virtual void SetFullscreenRoot(nsIDocument* aRoot) MOZ_OVERRIDE; + virtual nsresult RemoteFrameFullscreenReverted() override; + virtual nsIDocument* GetFullscreenRoot() override; + virtual void SetFullscreenRoot(nsIDocument* aRoot) override; // Returns the size of the mBlockedTrackingNodes array. (nsIDocument.h) // @@ -1255,10 +1255,10 @@ public: Element* FullScreenStackTop(); // DOM-exposed fullscreen API - virtual bool MozFullScreenEnabled() MOZ_OVERRIDE; - virtual Element* GetMozFullScreenElement(mozilla::ErrorResult& rv) MOZ_OVERRIDE; + virtual bool MozFullScreenEnabled() override; + virtual Element* GetMozFullScreenElement(mozilla::ErrorResult& rv) override; - void RequestPointerLock(Element* aElement) MOZ_OVERRIDE; + void RequestPointerLock(Element* aElement) override; bool ShouldLockPointer(Element* aElement, Element* aCurrentLock, bool aNoFocusCheck = false); bool SetPointerLock(Element* aElement, int aCursorStyle); @@ -1268,17 +1268,17 @@ public: // synchronously. void UpdateVisibilityState(); // Posts an event to call UpdateVisibilityState - virtual void PostVisibilityUpdateEvent() MOZ_OVERRIDE; + virtual void PostVisibilityUpdateEvent() override; - virtual void DocAddSizeOfExcludingThis(nsWindowSizes* aWindowSizes) const MOZ_OVERRIDE; + virtual void DocAddSizeOfExcludingThis(nsWindowSizes* aWindowSizes) const override; // DocAddSizeOfIncludingThis is inherited from nsIDocument. - virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; } + virtual nsIDOMNode* AsDOMNode() override { return this; } virtual void EnqueueLifecycleCallback(nsIDocument::ElementCallbackType aType, Element* aCustomElement, mozilla::dom::LifecycleCallbackArgs* aArgs = nullptr, - mozilla::dom::CustomElementDefinition* aDefinition = nullptr) MOZ_OVERRIDE; + mozilla::dom::CustomElementDefinition* aDefinition = nullptr) override; static void ProcessTopElementQueue(bool aIsBaseQueue = false); @@ -1303,51 +1303,51 @@ public: static bool RegisterEnabled(); virtual nsresult RegisterUnresolvedElement(mozilla::dom::Element* aElement, - nsIAtom* aTypeName = nullptr) MOZ_OVERRIDE; + nsIAtom* aTypeName = nullptr) override; // WebIDL bits virtual mozilla::dom::DOMImplementation* - GetImplementation(mozilla::ErrorResult& rv) MOZ_OVERRIDE; + GetImplementation(mozilla::ErrorResult& rv) override; virtual void RegisterElement(JSContext* aCx, const nsAString& aName, const mozilla::dom::ElementRegistrationOptions& aOptions, JS::MutableHandle aRetval, - mozilla::ErrorResult& rv) MOZ_OVERRIDE; - virtual mozilla::dom::StyleSheetList* StyleSheets() MOZ_OVERRIDE; - virtual void SetSelectedStyleSheetSet(const nsAString& aSheetSet) MOZ_OVERRIDE; - virtual void GetLastStyleSheetSet(nsString& aSheetSet) MOZ_OVERRIDE; - virtual mozilla::dom::DOMStringList* StyleSheetSets() MOZ_OVERRIDE; - virtual void EnableStyleSheetsForSet(const nsAString& aSheetSet) MOZ_OVERRIDE; + mozilla::ErrorResult& rv) override; + virtual mozilla::dom::StyleSheetList* StyleSheets() override; + virtual void SetSelectedStyleSheetSet(const nsAString& aSheetSet) override; + virtual void GetLastStyleSheetSet(nsString& aSheetSet) override; + virtual mozilla::dom::DOMStringList* StyleSheetSets() override; + virtual void EnableStyleSheetsForSet(const nsAString& aSheetSet) override; using nsIDocument::CreateElement; using nsIDocument::CreateElementNS; virtual already_AddRefed CreateElement(const nsAString& aTagName, const nsAString& aTypeExtension, - mozilla::ErrorResult& rv) MOZ_OVERRIDE; + mozilla::ErrorResult& rv) override; virtual already_AddRefed CreateElementNS(const nsAString& aNamespaceURI, const nsAString& aQualifiedName, const nsAString& aTypeExtension, - mozilla::ErrorResult& rv) MOZ_OVERRIDE; - virtual void UseRegistryFromDocument(nsIDocument* aDocument) MOZ_OVERRIDE; + mozilla::ErrorResult& rv) override; + virtual void UseRegistryFromDocument(nsIDocument* aDocument) override; - virtual nsIDocument* MasterDocument() MOZ_OVERRIDE + virtual nsIDocument* MasterDocument() override { return mMasterDocument ? mMasterDocument.get() : this; } - virtual void SetMasterDocument(nsIDocument* master) MOZ_OVERRIDE + virtual void SetMasterDocument(nsIDocument* master) override { MOZ_ASSERT(master); mMasterDocument = master; UseRegistryFromDocument(mMasterDocument); } - virtual bool IsMasterDocument() MOZ_OVERRIDE + virtual bool IsMasterDocument() override { return !mMasterDocument; } - virtual mozilla::dom::ImportManager* ImportManager() MOZ_OVERRIDE + virtual mozilla::dom::ImportManager* ImportManager() override { if (mImportManager) { MOZ_ASSERT(!mMasterDocument, "Only the master document has ImportManager set"); @@ -1366,28 +1366,28 @@ public: return mImportManager.get(); } - virtual bool HasSubImportLink(nsINode* aLink) MOZ_OVERRIDE + virtual bool HasSubImportLink(nsINode* aLink) override { return mSubImportLinks.Contains(aLink); } - virtual uint32_t IndexOfSubImportLink(nsINode* aLink) MOZ_OVERRIDE + virtual uint32_t IndexOfSubImportLink(nsINode* aLink) override { return mSubImportLinks.IndexOf(aLink); } - virtual void AddSubImportLink(nsINode* aLink) MOZ_OVERRIDE + virtual void AddSubImportLink(nsINode* aLink) override { mSubImportLinks.AppendElement(aLink); } - virtual nsINode* GetSubImportLink(uint32_t aIdx) MOZ_OVERRIDE + virtual nsINode* GetSubImportLink(uint32_t aIdx) override { return aIdx < mSubImportLinks.Length() ? mSubImportLinks[aIdx].get() : nullptr; } - virtual void UnblockDOMContentLoaded() MOZ_OVERRIDE; + virtual void UnblockDOMContentLoaded() override; protected: friend class nsNodeUtils; @@ -1459,9 +1459,9 @@ protected: void GetTitleFromElement(uint32_t aNodeType, nsAString& aTitle); public: // Get our title - virtual void GetTitle(nsString& aTitle) MOZ_OVERRIDE; + virtual void GetTitle(nsString& aTitle) override; // Set our title - virtual void SetTitle(const nsAString& aTitle, mozilla::ErrorResult& rv) MOZ_OVERRIDE; + virtual void SetTitle(const nsAString& aTitle, mozilla::ErrorResult& rv) override; static void XPCOMShutdown(); @@ -1498,9 +1498,9 @@ protected: const nsAString& aType, bool aPersisted); - virtual nsPIDOMWindow *GetWindowInternal() const MOZ_OVERRIDE; - virtual nsIScriptGlobalObject* GetScriptHandlingObjectInternal() const MOZ_OVERRIDE; - virtual bool InternalAllowXULXBL() MOZ_OVERRIDE; + virtual nsPIDOMWindow *GetWindowInternal() const override; + virtual nsIScriptGlobalObject* GetScriptHandlingObjectInternal() const override; + virtual bool InternalAllowXULXBL() override; #define NS_DOCUMENT_NOTIFY_OBSERVERS(func_, params_) \ NS_OBSERVER_ARRAY_NOTIFY_XPCOM_OBSERVERS(mObservers, nsIDocumentObserver, \ @@ -1581,7 +1581,7 @@ public: // ex. ,